Ver Fonte

fix array usage

Kolja Strohm há 2 anos atrás
pai
commit
9c32d91605
2 ficheiros alterados com 82 adições e 88 exclusões
  1. 82 87
      RegisterServer/RegisterServer.cpp
  2. 0 1
      RegisterServer/RegisterServer.h

+ 82 - 87
RegisterServer/RegisterServer.cpp

@@ -5,18 +5,17 @@
 
 // Inhalt der RegiserServer Klasse aus RegisterServer.h
 // Konstruktor 
-RegisterServer::RegisterServer( InitDatei *zIni )
+RegisterServer::RegisterServer( InitDatei* zIni )
     : Thread()
 {
     Network::Start( 100 );
     std::cout << "RS: Verbindung mit Datenbank wird hergestellt...\n";
     db = new RSDatenbank( zIni );
-    klientAnzahl = 0;
     klients = new RCArray< RSKlient >();
     empfangen = 0;
     gesendet = 0;
     fehler = new Text();
-    ini = dynamic_cast<InitDatei *>( zIni->getThis() );
+    ini = dynamic_cast<InitDatei*>(zIni->getThis());
     id = *zIni->zWert( "ServerId" );
     server = new Server();
     aServer = new SSLServer();
@@ -61,18 +60,18 @@ void RegisterServer::runn()
 {
     while( !end && aServer->isConnected() )
     {
-        SSLSKlient *klient;
+        SSLSKlient* klient;
         klient = aServer->getKlient();
         if( end && klient )
         {
             klient->trenne();
-            klient = (SSLSKlient *)klient->release();
+            klient = (SSLSKlient*)klient->release();
             Sleep( 1000 );
             return;
         }
         if( !klient )
             continue;
-        RSAKlient *clHandle = new RSAKlient( klient, dynamic_cast<RegisterServer *>( getThis() ) );
+        RSAKlient* clHandle = new RSAKlient( klient, dynamic_cast<RegisterServer*>(getThis()) );
         clHandle->start();
     }
 }
@@ -81,15 +80,14 @@ void RegisterServer::thread()
 {
     while( server->isConnected() )
     {
-        SKlient *klient;
+        SKlient* klient;
         klient = server->getKlient();
         if( !klient )
             continue;
         Framework::getThreadRegister()->cleanUpClosedThreads();
-        RSKlient *clHandle = new RSKlient( klient, dynamic_cast<RegisterServer *>( getThis() ) );
+        RSKlient* clHandle = new RSKlient( klient, dynamic_cast<RegisterServer*>(getThis()) );
         EnterCriticalSection( &cs );
-        klients->set( clHandle, klientAnzahl );
-        klientAnzahl++;
+        klients->add( clHandle );
         LeaveCriticalSection( &cs );
         clHandle->start();
     }
@@ -103,15 +101,14 @@ void RegisterServer::close()
     warteAufThread( 1000 );
 #endif
     EnterCriticalSection( &cs );
-    for( int i = 0; i < klientAnzahl; i++ )
+    for( int i = 0; i < klients->getEintragAnzahl(); i++ )
         klients->z( i )->absturz();
-    klients = ( RCArray<RSKlient>* )klients->release();
-    klientAnzahl = 0;
+    klients = (RCArray<RSKlient>*)klients->release();
     LeaveCriticalSection( &cs );
     ende();
     run = 0;
     end = 1;
-    Klient *klient = new Klient();
+    Klient* klient = new Klient();
     klient->verbinde( aServer->getPort(), "127.0.0.1" );
     Sleep( 500 );
     aServer->trenne();
@@ -209,13 +206,12 @@ bool RegisterServer::absturzKlient( int klientId )
 {
     bool gefunden = 0;
     EnterCriticalSection( &cs );
-    for( int i = 0; i < klientAnzahl; i++ )
+    for( int i = 0; i < klients->getEintragAnzahl(); i++ )
     {
         if( klients->z( i )->getKlientNummer() == klientId )
         {
             klients->z( i )->absturz();
             klients->remove( i );
-            klientAnzahl--;
             gefunden = 1;
             break;
         }
@@ -224,16 +220,15 @@ bool RegisterServer::absturzKlient( int klientId )
     return gefunden;
 }
 
-bool RegisterServer::removeKlient( RSKlient *zKlient )
+bool RegisterServer::removeKlient( RSKlient* zKlient )
 {
     bool gefunden = 0;
     EnterCriticalSection( &cs );
-    for( int i = 0; i < klientAnzahl; i++ )
+    for( int i = 0; i < klients->getEintragAnzahl(); i++ )
     {
         if( klients->z( i ) == zKlient )
         {
             klients->remove( i );
-            klientAnzahl--;
             gefunden = 1;
             break;
         }
@@ -258,19 +253,19 @@ bool RegisterServer::istAn() const
     return db->serverIstNichtPausiert( id );
 }
 
-Server *RegisterServer::zServer() const
+Server* RegisterServer::zServer() const
 {
     return server;
 }
 
-RSDatenbank *RegisterServer::zDB() const
+RSDatenbank* RegisterServer::zDB() const
 {
     return db;
 }
 
 bool RegisterServer::hatClients() const
 {
-    return klientAnzahl > 0;
+    return klients->hat( 0 );
 }
 
 int RegisterServer::getId() const
@@ -278,12 +273,12 @@ int RegisterServer::getId() const
     return id;
 }
 
-char *RegisterServer::getLetzterFehler() const
+char* RegisterServer::getLetzterFehler() const
 {
     return fehler->getText();
 }
 
-InitDatei *RegisterServer::zIni() const
+InitDatei* RegisterServer::zIni() const
 {
     return ini;
 }
@@ -291,7 +286,7 @@ InitDatei *RegisterServer::zIni() const
 
 // Inhalt der RSAKlient Klasse aus RegisterServer.h
 // Konstruktor 
-RSAKlient::RSAKlient( SSLSKlient *klient, RegisterServer *rs )
+RSAKlient::RSAKlient( SSLSKlient* klient, RegisterServer* rs )
     : Thread()
 {
     this->klient = klient;
@@ -330,14 +325,14 @@ void RSAKlient::thread()
                 {
                     klient->sende( "\1", 1 );
                     unsigned char nLen = 0;
-                    klient->getNachricht( (char *)&nLen, 1 );
-                    char *n = new char[ nLen + 1 ];
+                    klient->getNachricht( (char*)&nLen, 1 );
+                    char* n = new char[ nLen + 1 ];
                     n[ (int)nLen ] = 0;
                     if( nLen )
                         klient->getNachricht( n, nLen );
                     unsigned char pLen = 0;
-                    klient->getNachricht( (char *)&pLen, 1 );
-                    char *p = new char[ pLen + 1 ];
+                    klient->getNachricht( (char*)&pLen, 1 );
+                    char* p = new char[ pLen + 1 ];
                     p[ (int)pLen ] = 0;
                     if( pLen )
                         klient->getNachricht( p, pLen );
@@ -374,7 +369,7 @@ void RSAKlient::thread()
                     {
                         if( !rs->serverStarten() )
                         {
-                            Text *err = new Text();
+                            Text* err = new Text();
                             err->append( rs->getLetzterFehler() );
                             errorZuKlient( err->getText() );
                             err->release();
@@ -397,7 +392,7 @@ void RSAKlient::thread()
                             klient->sende( "\1", 1 );
                         else
                         {
-                            Text *err = new Text();
+                            Text* err = new Text();
                             err->append( rs->getLetzterFehler() );
                             errorZuKlient( err->getText() );
                             err->release();
@@ -421,7 +416,7 @@ void RSAKlient::thread()
                                 ok = 1;
                             else
                             {
-                                Text *err = new Text();
+                                Text* err = new Text();
                                 err->append( rs->getLetzterFehler() );
                                 errorZuKlient( err->getText() );
                                 err->release();
@@ -506,7 +501,7 @@ void RSAKlient::thread()
                             klient->sende( "\1", 1 );
                         else
                         {
-                            Text *err = new Text();
+                            Text* err = new Text();
                             err->append( rs->getLetzterFehler() );
                             errorZuKlient( err->getText() );
                             err->release();
@@ -528,14 +523,14 @@ void RSAKlient::thread()
                 {
                     klient->sende( "\1", 1 );
                     int maxC = 0;
-                    klient->getNachricht( (char *)&maxC, 4 );
+                    klient->getNachricht( (char*)&maxC, 4 );
                     if( rs->zDB()->adminHatRecht( adminId, Admin_Recht::RSMCChange ) )
                     {
                         if( rs->setMaxKlients( maxC ) )
                             klient->sende( "\1", 1 );
                         else
                         {
-                            Text *err = new Text();
+                            Text* err = new Text();
                             err->append( rs->getLetzterFehler() );
                             errorZuKlient( err->getText() );
                             err->release();
@@ -550,7 +545,7 @@ void RSAKlient::thread()
                 {
                     klient->sende( "\1", 1 );
                     int klientId = 0;
-                    klient->getNachricht( (char *)&klientId, 4 );
+                    klient->getNachricht( (char*)&klientId, 4 );
                     if( klientId && rs->absturzKlient( klientId ) )
                         klient->sende( "\1", 1 );
                     else
@@ -572,7 +567,7 @@ void RSAKlient::thread()
     delete this;
 }
 
-void RSAKlient::errorZuKlient( const char *nachricht ) const // sendet eine Fehlernachricht zum Klient
+void RSAKlient::errorZuKlient( const char* nachricht ) const // sendet eine Fehlernachricht zum Klient
 {
     klient->sende( "\3", 1 );
     char len = (char)textLength( nachricht );
@@ -583,13 +578,13 @@ void RSAKlient::errorZuKlient( const char *nachricht ) const // sendet eine Fehl
 
 // Inhalt der RSKlasse aus RegisterServer.h
 // Konstruktor 
-RSKlient::RSKlient( SKlient *klient, RegisterServer *rs )
+RSKlient::RSKlient( SKlient* klient, RegisterServer* rs )
     : Thread()
 {
     this->klient = klient;
     unsigned char key[ 20 ] = { 186, 186, 179, 126, 216, 207, 123, 154, 168, 149, 51, 221, 6, 193, 160, 141, 164, 126, 44, 242 };
-    klient->setSendeKey( (char *)key, 20 );
-    klient->setEmpfangKey( (char *)key, 20 );
+    klient->setSendeKey( (char*)key, 20 );
+    klient->setEmpfangKey( (char*)key, 20 );
     klientNummer = 0;
     this->rs = rs;
 }
@@ -622,7 +617,7 @@ void RSKlient::thread()
             switch( c )
             {
             case 1: // Klient identifikation
-                klient->getNachrichtEncrypted( (char *)&klientNummer, 4 );
+                klient->getNachrichtEncrypted( (char*)&klientNummer, 4 );
                 if( !rs->zDB()->proveKlient( klientNummer, rs->getId() ) )
                 {
                     klientNummer = 0;
@@ -630,7 +625,7 @@ void RSKlient::thread()
                 }
                 else
                 {
-                    Text *key = rs->zDB()->getKlientKey( klientNummer );
+                    Text* key = rs->zDB()->getKlientKey( klientNummer );
                     if( !key )
                         errorZuKlient( "Es konnte kein Key ermittelt werden." );
                     else
@@ -653,7 +648,7 @@ void RSKlient::thread()
                         if( 1 )
                         {
                             int klientId = 0;
-                            klient->getNachrichtEncrypted( (char *)&klientId, 4 );
+                            klient->getNachrichtEncrypted( (char*)&klientId, 4 );
                             if( klientId && rs->absturzKlient( klientId ) )
                                 klient->sendeEncrypted( "\1", 1 );
                             else
@@ -689,21 +684,21 @@ void RSKlient::thread()
                     }
                     klient->sendeEncrypted( "\1", 1 );
                     unsigned char len[ 4 ] = { 0, 0, 0, 0 };
-                    klient->getNachrichtEncrypted( (char *)len, 4 );
-                    char *acc_name = new char[ len[ 0 ] + 1 ];
+                    klient->getNachrichtEncrypted( (char*)len, 4 );
+                    char* acc_name = new char[ len[ 0 ] + 1 ];
                     acc_name[ len[ 0 ] ] = 0;
                     klient->getNachrichtEncrypted( acc_name, len[ 0 ] );
-                    char *acc_pass = new char[ len[ 1 ] + 1 ];
+                    char* acc_pass = new char[ len[ 1 ] + 1 ];
                     acc_pass[ len[ 1 ] ] = 0;
                     klient->getNachrichtEncrypted( acc_pass, len[ 1 ] );
-                    char *acc_geheim = new char[ len[ 2 ] + 1 ];
+                    char* acc_geheim = new char[ len[ 2 ] + 1 ];
                     acc_geheim[ len[ 2 ] ] = 0;
                     klient->getNachrichtEncrypted( acc_geheim, len[ 2 ] );
-                    char *acc_mail = new char[ len[ 3 ] + 1 ];
+                    char* acc_mail = new char[ len[ 3 ] + 1 ];
                     acc_mail[ len[ 3 ] ] = 0;
                     klient->getNachrichtEncrypted( acc_mail, len[ 3 ] );
                     unsigned short acc_geb_jahr = 0;
-                    klient->getNachrichtEncrypted( (char *)&acc_geb_jahr, 2 );
+                    klient->getNachrichtEncrypted( (char*)&acc_geb_jahr, 2 );
                     char acc_geb_monat = 0;
                     klient->getNachrichtEncrypted( &acc_geb_monat, 1 );
                     char acc_geb_tag = 0;
@@ -711,7 +706,7 @@ void RSKlient::thread()
                     int pres = rs->zDB()->proveNeuAccount( acc_name, acc_mail );
                     if( !pres )
                     {
-                        Text *gebDatum = new Text( "" );
+                        Text* gebDatum = new Text( "" );
                         gebDatum->append( (int)acc_geb_jahr );
                         gebDatum->append( "-" );
                         gebDatum->append( (int)acc_geb_monat );
@@ -719,7 +714,7 @@ void RSKlient::thread()
                         gebDatum->append( (int)acc_geb_tag );
                         if( !rs->zDB()->neuAccount( acc_name, acc_pass, acc_geheim, acc_mail, gebDatum->getText(), rs->zIni() ) )
                         {
-                            Text *err = new Text( "Das Datum '" );
+                            Text* err = new Text( "Das Datum '" );
                             err->append( gebDatum->getText() );
                             err->append( "' ist kein gültiges Datum." );
                             errorZuKlient( err->getText() );
@@ -752,14 +747,14 @@ void RSKlient::thread()
                     }
                     klient->sendeEncrypted( "\1", 1 );
                     unsigned char len[ 3 ];
-                    klient->getNachrichtEncrypted( (char *)len, 3 );
-                    char *acc_name = new char[ len[ 0 ] + 1 ];
+                    klient->getNachrichtEncrypted( (char*)len, 3 );
+                    char* acc_name = new char[ len[ 0 ] + 1 ];
                     acc_name[ (int)len[ 0 ] ] = 0;
                     klient->getNachrichtEncrypted( acc_name, len[ 0 ] );
-                    char *acc_pass = new char[ len[ 1 ] + 1 ];
+                    char* acc_pass = new char[ len[ 1 ] + 1 ];
                     acc_pass[ (int)len[ 1 ] ] = 0;
                     klient->getNachrichtEncrypted( acc_pass, len[ 1 ] );
-                    char *acc_geheim = new char[ len[ 2 ] + 1 ];
+                    char* acc_geheim = new char[ len[ 2 ] + 1 ];
                     acc_geheim[ (int)len[ 2 ] ] = 0;
                     klient->getNachrichtEncrypted( acc_geheim, len[ 2 ] );
                     int res = rs->zDB()->removeAccount( acc_name, acc_pass, acc_geheim, rs->zIni() );
@@ -777,7 +772,7 @@ void RSKlient::thread()
                             }
                             if( len == -1 )
                                 break;
-                            char *key = new char[ len + 1 ];
+                            char* key = new char[ len + 1 ];
                             key[ (int)len ] = 0;
                             klient->getNachrichtEncrypted( key, len );
                             if( rs->zDB()->removeConfirmation( acc_name, key ) )
@@ -812,17 +807,17 @@ void RSKlient::thread()
                     }
                     klient->sendeEncrypted( "\1", 1 );
                     unsigned char len[ 4 ];
-                    klient->getNachrichtEncrypted( (char *)len, 4 );
-                    char *accName = new char[ len[ 0 ] + 1 ];
+                    klient->getNachrichtEncrypted( (char*)len, 4 );
+                    char* accName = new char[ len[ 0 ] + 1 ];
                     accName[ len[ 0 ] ] = 0;
                     klient->getNachrichtEncrypted( accName, len[ 0 ] );
-                    char *accPasswort = new char[ len[ 1 ] + 1 ];
+                    char* accPasswort = new char[ len[ 1 ] + 1 ];
                     accPasswort[ len[ 1 ] ] = 0;
                     klient->getNachrichtEncrypted( accPasswort, len[ 1 ] );
-                    char *neuPasswort = new char[ len[ 2 ] + 1 ];
+                    char* neuPasswort = new char[ len[ 2 ] + 1 ];
                     neuPasswort[ len[ 2 ] ] = 0;
                     klient->getNachrichtEncrypted( neuPasswort, len[ 2 ] );
-                    char *accGeheimnis = new char[ len[ 3 ] + 1 ];
+                    char* accGeheimnis = new char[ len[ 3 ] + 1 ];
                     accGeheimnis[ len[ 3 ] ] = 0;
                     klient->getNachrichtEncrypted( accGeheimnis, len[ 3 ] );
                     int res = rs->zDB()->passwortChange( accName, accPasswort, neuPasswort, accGeheimnis );
@@ -850,17 +845,17 @@ void RSKlient::thread()
                     }
                     klient->sendeEncrypted( "\1", 1 );
                     unsigned char len[ 4 ];
-                    klient->getNachrichtEncrypted( (char *)len, 4 );
-                    char *accName = new char[ len[ 0 ] + 1 ];
+                    klient->getNachrichtEncrypted( (char*)len, 4 );
+                    char* accName = new char[ len[ 0 ] + 1 ];
                     accName[ len[ 0 ] ] = 0;
                     klient->getNachrichtEncrypted( accName, len[ 0 ] );
-                    char *accPasswort = new char[ len[ 1 ] + 1 ];
+                    char* accPasswort = new char[ len[ 1 ] + 1 ];
                     accPasswort[ len[ 1 ] ] = 0;
                     klient->getNachrichtEncrypted( accPasswort, len[ 1 ] );
-                    char *accGeheimnis = new char[ len[ 2 ] + 1 ];
+                    char* accGeheimnis = new char[ len[ 2 ] + 1 ];
                     accGeheimnis[ len[ 2 ] ] = 0;
                     klient->getNachrichtEncrypted( accGeheimnis, len[ 2 ] );
-                    char *neuEMail = new char[ len[ 3 ] + 1 ];
+                    char* neuEMail = new char[ len[ 3 ] + 1 ];
                     neuEMail[ len[ 3 ] ] = 0;
                     klient->getNachrichtEncrypted( neuEMail, len[ 3 ] );
                     int res = rs->zDB()->eMailChange( accName, accPasswort, accGeheimnis, neuEMail );
@@ -890,17 +885,17 @@ void RSKlient::thread()
                     }
                     klient->sendeEncrypted( "\1", 1 );
                     unsigned char len[ 4 ];
-                    klient->getNachrichtEncrypted( (char *)len, 4 );
-                    char *accName = new char[ len[ 0 ] + 1 ];
+                    klient->getNachrichtEncrypted( (char*)len, 4 );
+                    char* accName = new char[ len[ 0 ] + 1 ];
                     accName[ len[ 0 ] ] = 0;
                     klient->getNachrichtEncrypted( accName, len[ 0 ] );
-                    char *accPasswort = new char[ len[ 1 ] + 1 ];
+                    char* accPasswort = new char[ len[ 1 ] + 1 ];
                     accPasswort[ len[ 1 ] ] = 0;
                     klient->getNachrichtEncrypted( accPasswort, len[ 1 ] );
-                    char *accGeheimnis = new char[ len[ 2 ] + 1 ];
+                    char* accGeheimnis = new char[ len[ 2 ] + 1 ];
                     accGeheimnis[ len[ 2 ] ] = 0;
                     klient->getNachrichtEncrypted( accGeheimnis, len[ 2 ] );
-                    char *neuGeheimnis = new char[ len[ 3 ] + 1 ];
+                    char* neuGeheimnis = new char[ len[ 3 ] + 1 ];
                     neuGeheimnis[ len[ 3 ] ] = 0;
                     klient->getNachrichtEncrypted( neuGeheimnis, len[ 3 ] );
                     int res = rs->zDB()->geheimnisChange( accName, accPasswort, accGeheimnis, neuGeheimnis );
@@ -928,11 +923,11 @@ void RSKlient::thread()
                     }
                     klient->sendeEncrypted( "\1", 1 );
                     unsigned char len[ 2 ];
-                    klient->getNachrichtEncrypted( (char *)len, 2 );
-                    char *accPasswort = new char[ len[ 0 ] + 1 ];
+                    klient->getNachrichtEncrypted( (char*)len, 2 );
+                    char* accPasswort = new char[ len[ 0 ] + 1 ];
                     accPasswort[ len[ 0 ] ] = 0;
                     klient->getNachrichtEncrypted( accPasswort, len[ 0 ] );
-                    char *accGeheimnis = new char[ len[ 1 ] + 1 ];
+                    char* accGeheimnis = new char[ len[ 1 ] + 1 ];
                     accGeheimnis[ len[ 1 ] ] = 0;
                     klient->getNachrichtEncrypted( accGeheimnis, len[ 1 ] );
                     if( rs->zDB()->nameVergessen( accPasswort, accGeheimnis, rs->zIni() ) )
@@ -953,11 +948,11 @@ void RSKlient::thread()
                     }
                     klient->sendeEncrypted( "\1", 1 );
                     unsigned char len[ 2 ];
-                    klient->getNachrichtEncrypted( (char *)len, 2 );
-                    char *accName = new char[ len[ 0 ] + 1 ];
+                    klient->getNachrichtEncrypted( (char*)len, 2 );
+                    char* accName = new char[ len[ 0 ] + 1 ];
                     accName[ len[ 0 ] ] = 0;
                     klient->getNachrichtEncrypted( accName, len[ 0 ] );
-                    char *accGeheimnis = new char[ len[ 1 ] + 1 ];
+                    char* accGeheimnis = new char[ len[ 1 ] + 1 ];
                     accGeheimnis[ len[ 1 ] ] = 0;
                     klient->getNachrichtEncrypted( accGeheimnis, len[ 1 ] );
                     if( rs->zDB()->passwortVergessen( accName, accGeheimnis, rs->zIni() ) )
@@ -978,11 +973,11 @@ void RSKlient::thread()
                     }
                     klient->sendeEncrypted( "\1", 1 );
                     unsigned char len[ 2 ];
-                    klient->getNachrichtEncrypted( (char *)len, 2 );
-                    char *accName = new char[ len[ 0 ] + 1 ];
+                    klient->getNachrichtEncrypted( (char*)len, 2 );
+                    char* accName = new char[ len[ 0 ] + 1 ];
                     accName[ len[ 0 ] ] = 0;
                     klient->getNachrichtEncrypted( accName, len[ 0 ] );
-                    char *accPasswort = new char[ len[ 1 ] + 1 ];
+                    char* accPasswort = new char[ len[ 1 ] + 1 ];
                     accPasswort[ len[ 1 ] ] = 0;
                     klient->getNachrichtEncrypted( accPasswort, len[ 1 ] );
                     if( rs->zDB()->geheimnisVergessen( accName, accPasswort, rs->zIni() ) )
@@ -1003,22 +998,22 @@ void RSKlient::thread()
                     }
                     klient->sendeEncrypted( "\1", 1 );
                     unsigned char len[ 3 ];
-                    klient->getNachrichtEncrypted( (char *)len, 3 );
-                    char *accName = new char[ len[ 0 ] + 1 ];
+                    klient->getNachrichtEncrypted( (char*)len, 3 );
+                    char* accName = new char[ len[ 0 ] + 1 ];
                     accName[ len[ 0 ] ] = 0;
                     klient->getNachrichtEncrypted( accName, len[ 0 ] );
-                    char *accPasswort = new char[ len[ 1 ] + 1 ];
+                    char* accPasswort = new char[ len[ 1 ] + 1 ];
                     accPasswort[ len[ 1 ] ] = 0;
                     klient->getNachrichtEncrypted( accPasswort, len[ 1 ] );
-                    char *accGeheimnis = new char[ len[ 2 ] + 1 ];
+                    char* accGeheimnis = new char[ len[ 2 ] + 1 ];
                     accGeheimnis[ len[ 2 ] ] = 0;
                     klient->getNachrichtEncrypted( accGeheimnis, len[ 2 ] );
-                    Text *eMail = rs->zDB()->eMailVergessen( accName, accPasswort, accGeheimnis );
+                    Text* eMail = rs->zDB()->eMailVergessen( accName, accPasswort, accGeheimnis );
                     if( eMail )
                     {
                         klient->sendeEncrypted( "\1", 1 );
                         unsigned char len = (unsigned char)eMail->getLength();
-                        klient->sendeEncrypted( (char *)&len, 1 );
+                        klient->sendeEncrypted( (char*)&len, 1 );
                         klient->sendeEncrypted( eMail->getText(), len );
                         eMail->release();
                     }
@@ -1056,7 +1051,7 @@ void RSKlient::thread()
 }
 
 // constant
-void RSKlient::errorZuKlient( const char *nachricht ) const // sendet eine Fehlernachricht zum Klient
+void RSKlient::errorZuKlient( const char* nachricht ) const // sendet eine Fehlernachricht zum Klient
 {
     klient->sendeEncrypted( "\3", 1 );
     char len = (char)textLength( nachricht );

+ 0 - 1
RegisterServer/RegisterServer.h

@@ -23,7 +23,6 @@ private:
 	CRITICAL_SECTION cs;
 	RCArray< RSKlient > *klients;
 	Text *fehler;
-	int klientAnzahl;
 	int id;
 	bool nichtPausiert;
 	int empfangen;