[Scummvm-cvs-logs] CVS: scummvm/common config-manager.cpp,1.34,1.35 list.h,1.22,1.23 md5.cpp,1.6,1.7 savefile.cpp,1.20,1.21

[Max Horn]

Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28088/common

Modified Files:
	config-manager.cpp list.h md5.cpp savefile.cpp 
Log Message:
Comply to our coding conventions

Index: config-manager.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/config-manager.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- config-manager.cpp	2 May 2005 05:29:50 -0000	1.34
+++ config-manager.cpp	8 May 2005 21:49:32 -0000	1.35
@@ -81,7 +81,7 @@
 void ConfigManager::loadDefaultConfigFile() {
 	char configFile[MAXPATHLEN];
 #if defined(UNIX)
-	if(getenv("HOME") != NULL)
+	if (getenv("HOME") != NULL)
 		sprintf(configFile,"%s/%s", getenv("HOME"), DEFAULT_CONFIG_FILE);
 	else
 		strcpy(configFile, DEFAULT_CONFIG_FILE);

Index: list.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/list.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- list.h	1 Jan 2005 17:52:17 -0000	1.22
+++ list.h	8 May 2005 21:49:32 -0000	1.23
@@ -182,7 +182,7 @@
 				static_cast<Node<T> *>(i._node)->_data = static_cast<Node<T> *>(j._node)->_data;
 			}
 
-			if(i == end())
+			if (i == end())
 				insert(i, j, list.end());
 			else
 				erase(i, end());

Index: md5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/md5.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- md5.cpp	1 Jan 2005 16:08:49 -0000	1.6
+++ md5.cpp	8 May 2005 21:49:32 -0000	1.7
@@ -171,7 +171,7 @@
 {
     uint32 left, fill;
 
-    if( ! length ) return;
+    if ( ! length ) return;
 
     left = ctx->total[0] & 0x3F;
     fill = 64 - left;
@@ -179,10 +179,10 @@
     ctx->total[0] += length;
     ctx->total[0] &= 0xFFFFFFFF;
 
-    if( ctx->total[0] < length )
+    if ( ctx->total[0] < length )
         ctx->total[1]++;
 
-    if( left && length >= fill )
+    if ( left && length >= fill )
     {
         memcpy( (void *) (ctx->buffer + left),
                 (const void *) input, fill );
@@ -192,14 +192,14 @@
         left = 0;
     }
 
-    while( length >= 64 )
+    while ( length >= 64 )
     {
         md5_process( ctx, input );
         length -= 64;
         input  += 64;
     }
 
-    if( length )
+    if ( length )
     {
         memcpy( (void *) (ctx->buffer + left),
                 (const void *) input, length );
@@ -249,28 +249,28 @@
 	int readlen;
 
 	f.open(name, File::kFileReadMode, directory);
-	if( ! f.isOpen() )
+	if ( ! f.isOpen() )
 	{
 		warning( "md5_file couldn't open '%s'", name );
 		return false;
 	}
 
-	if( ! restricted || sizeof( buf ) <= length ) 
+	if ( ! restricted || sizeof( buf ) <= length ) 
 		readlen = sizeof( buf );
 	else 
 		readlen = length;
 
 	md5_starts( &ctx );
 
-	while( ( i = f.read( buf, readlen ) ) > 0 )
+	while ( ( i = f.read( buf, readlen ) ) > 0 )
 	{
 		md5_update( &ctx, buf, i );
 
 		length -= i;
-		if( restricted && length == 0 )
+		if ( restricted && length == 0 )
 			break;
 
-		if( restricted && sizeof( buf ) > length ) 
+		if ( restricted && sizeof( buf ) > length ) 
 			readlen = length;
 	}
 
@@ -317,11 +317,11 @@
     md5_context ctx;
     unsigned char md5sum[16];
 
-    if( argc < 2 )
+    if ( argc < 2 )
     {
         printf( "\n MD5 Validation Tests:\n\n" );
 
-        for( i = 0; i < 7; i++ )
+        for ( i = 0; i < 7; i++ )
         {
             printf( " Test %d ", i + 1 );
 
@@ -329,12 +329,12 @@
             md5_update( &ctx, (const uint8 *) msg[i], strlen( msg[i] ) );
             md5_finish( &ctx, md5sum );
 
-            for( j = 0; j < 16; j++ )
+            for ( j = 0; j < 16; j++ )
             {
                 sprintf( output + j * 2, "%02x", md5sum[j] );
             }
 
-            if( memcmp( output, val[i], 32 ) )
+            if ( memcmp( output, val[i], 32 ) )
             {
                 printf( "failed!\n" );
                 return( 1 );
@@ -347,10 +347,10 @@
     }
     else
     {
-    	for( i = 1; i < argc; i++ )
+    	for ( i = 1; i < argc; i++ )
     	{
 			md5_file( argv[i], md5sum );
-			for( j = 0; j < 16; j++ )
+			for ( j = 0; j < 16; j++ )
 			{
 				printf( "%02x", md5sum[j] );
 			}

Index: savefile.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/savefile.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- savefile.cpp	5 May 2005 15:59:22 -0000	1.20
+++ savefile.cpp	8 May 2005 21:49:32 -0000	1.21
@@ -69,7 +69,7 @@
 		fh = ::fopen(filename, (saveOrLoad? "wb" : "rb"));
 	}
 	~StdioSaveFile() {
-		if(fh)
+		if (fh)
 			::fclose(fh);
 	}
 
@@ -99,7 +99,7 @@
 		fh = ::gzopen(filename, (saveOrLoad? "wb" : "rb"));
 	}
 	~GzipSaveFile() {
-		if(fh)
+		if (fh)
 			::gzclose(fh);
 	}