[ros-diffs] [cwittich] 29447: used autoformat in MSVC to get the code readable again
cwittich at svn.reactos.org
cwittich at svn.reactos.org
Mon Oct 8 00:51:05 CEST 2007
Author: cwittich
Date: Mon Oct 8 02:51:05 2007
New Revision: 29447
URL: http://svn.reactos.org/svn/reactos?rev=29447&view=rev
Log:
used autoformat in MSVC to get the code readable again
Modified:
trunk/reactos/tools/stubgen.c
Modified: trunk/reactos/tools/stubgen.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/stubgen.c?rev=29447&r1=29446&r2=29447&view=diff
==============================================================================
--- trunk/reactos/tools/stubgen.c (original)
+++ trunk/reactos/tools/stubgen.c Mon Oct 8 02:51:05 2007
@@ -9,149 +9,149 @@
#endif
typedef struct _stub {
- char *name;
- char *origin;
- struct _stub *next;
+ char *name;
+ char *origin;
+ struct _stub *next;
} stub;
void usage( char *name ) {
- fprintf( stderr,
- "Usage: %s [-n nm] [-m make] libs...\n"
- "nm -- The command used to run nm on reactos objects\n"
- "make -- The command used to build reactos\n\n"
- "libs are import libraries (.a files) typically from\n"
- "dk/lib/nkm and dk/lib/w32\n",
- name );
+ fprintf( stderr,
+ "Usage: %s [-n nm] [-m make] libs...\n"
+ "nm -- The command used to run nm on reactos objects\n"
+ "make -- The command used to build reactos\n\n"
+ "libs are import libraries (.a files) typically from\n"
+ "dk/lib/nkm and dk/lib/w32\n",
+ name );
}
int main( int argc, char **argv ) {
- char line[1024];
- char *make = "make";
- char *nm = "nm";
- char *origin = "unknown.a";
- stub *functions = NULL, *new_f, *imports = NULL, *search;
- FILE *make_f, *nm_f;
- int i, libstart = argc;
- FILE *out = fopen("tests/stubs.tst","w");
+ char line[1024];
+ char *make = "make";
+ char *nm = "nm";
+ char *origin = "unknown.a";
+ stub *functions = NULL, *new_f, *imports = NULL, *search;
+ FILE *make_f, *nm_f;
+ int i, libstart = argc;
+ FILE *out = fopen("tests/stubs.tst","w");
- if( argc == 1 ) { usage(argv[0]); return 1; }
+ if( argc == 1 ) { usage(argv[0]); return 1; }
- if( !out ) {
- fprintf( stderr, "Could not write file tests/stubs.tst\n" );
- return 1;
- }
-
- fprintf( out, "# Automatically generated by stubgen\n" );
-
- for( i = 1; i < argc; i++ ) {
- if( !strcmp( argv[i], "-m" ) ) {
- make = argv[i+1];
- i++;
- } else if( !strcmp( argv[i], "-n" ) ) {
- nm = argv[i+1];
- i++;
- } else { libstart = i; break; }
- }
-
- snprintf( line, sizeof(line), "%s test 2>&1", make );
- make_f = popen( line, "r" );
-
- if( !make_f ) {
- fclose( out );
- fprintf( stderr, "Could not run %s test\n", make );
- return 1;
- }
-
- while( fgets( line, sizeof(line), make_f ) ) {
- char *end_of_location;
- char *begin_q, *end_q;
-
- if( !strstr( line, "undefined reference to" ) ) continue;
-
- end_of_location = strrchr( line, ':' );
-
- if( !end_of_location ) continue;
-
- begin_q = strchr( end_of_location, '`' );
- end_q = strchr( end_of_location, '\'' );
-
- if( !begin_q || !end_q ) continue;
-
- begin_q += 2; /* skip `_ */
-
- memmove( line, begin_q, end_q - begin_q );
- line[end_q - begin_q] = 0;
-
- for( new_f = functions; new_f; new_f = new_f->next )
- if( !strcmp( new_f->name, line ) ) break;
-
- if( new_f ) continue;
-
- new_f = (stub *)malloc( sizeof(stub) );
- if( !new_f ) {fprintf( stderr, "Out of memory\n" ); return 1;}
-
- new_f->name = strdup( line );
- new_f->next = functions;
- functions = new_f;
- }
-
- /* Scan libraries and collect available import sections */
- for( i = libstart; i < argc; i++ ) {
- snprintf( line, sizeof(line), "%s %s", nm, argv[i] );
- nm_f = popen( line, "r" );
-
- for( origin = argv[i]; *argv[i]; argv[i]++ )
- if( *argv[i] == '/' || *argv[i] == '\\' )
- origin = argv[i] + 1;
-
-
- if( !nm_f ) {
- fprintf( stderr, "Could not run %s\n", line );
- continue;
+ if( !out ) {
+ fprintf( stderr, "Could not write file tests/stubs.tst\n" );
+ return 1;
}
- while( fgets( line, sizeof(line), nm_f ) ) {
- char *import_sign, *eol;
+ fprintf( out, "# Automatically generated by stubgen\n" );
- if( !(import_sign = strstr( line, " I " )) ) continue;
-
- import_sign += 3;
- while( *import_sign && isspace(*import_sign) ) import_sign++;
-
- /* Strip ws after name */
- for( eol = import_sign; *eol && !isspace(*eol); eol++ );
-
- *eol = 0;
-
- for( new_f = imports; new_f; new_f = new_f->next )
- if( !strcmp( new_f->name, import_sign ) ) break;
-
- if( new_f ) continue;
-
- new_f = (stub *)malloc( sizeof(stub) );
- if( !new_f ) {fprintf( stderr, "Out of memory\n" ); return 1;}
-
- new_f->name = strdup( import_sign + 1 );
- new_f->origin = origin;
- new_f->next = imports;
- imports = new_f;
+ for( i = 1; i < argc; i++ ) {
+ if( !strcmp( argv[i], "-m" ) ) {
+ make = argv[i+1];
+ i++;
+ } else if( !strcmp( argv[i], "-n" ) ) {
+ nm = argv[i+1];
+ i++;
+ } else { libstart = i; break; }
}
- fclose( nm_f );
- }
+ snprintf( line, sizeof(line), "%s test 2>&1", make );
+ make_f = popen( line, "r" );
- /* Now we have a list of unique functions and a list of imports,
- lookup each function and output the entry from the import list. */
- for( new_f = functions; new_f; new_f = new_f->next ) {
- for( search = imports; search; search = search->next ) {
- if( !strcmp( new_f->name, search->name ) ) {
- fprintf( out, "%s %s\n", search->origin, search->name );
- continue;
- }
+ if( !make_f ) {
+ fclose( out );
+ fprintf( stderr, "Could not run %s test\n", make );
+ return 1;
}
- }
- fclose( out );
+ while( fgets( line, sizeof(line), make_f ) ) {
+ char *end_of_location;
+ char *begin_q, *end_q;
- return 0;
+ if( !strstr( line, "undefined reference to" ) ) continue;
+
+ end_of_location = strrchr( line, ':' );
+
+ if( !end_of_location ) continue;
+
+ begin_q = strchr( end_of_location, '`' );
+ end_q = strchr( end_of_location, '\'' );
+
+ if( !begin_q || !end_q ) continue;
+
+ begin_q += 2; /* skip `_ */
+
+ memmove( line, begin_q, end_q - begin_q );
+ line[end_q - begin_q] = 0;
+
+ for( new_f = functions; new_f; new_f = new_f->next )
+ if( !strcmp( new_f->name, line ) ) break;
+
+ if( new_f ) continue;
+
+ new_f = (stub *)malloc( sizeof(stub) );
+ if( !new_f ) {fprintf( stderr, "Out of memory\n" ); return 1;}
+
+ new_f->name = strdup( line );
+ new_f->next = functions;
+ functions = new_f;
+ }
+
+ /* Scan libraries and collect available import sections */
+ for( i = libstart; i < argc; i++ ) {
+ snprintf( line, sizeof(line), "%s %s", nm, argv[i] );
+ nm_f = popen( line, "r" );
+
+ for( origin = argv[i]; *argv[i]; argv[i]++ )
+ if( *argv[i] == '/' || *argv[i] == '\\' )
+ origin = argv[i] + 1;
+
+
+ if( !nm_f ) {
+ fprintf( stderr, "Could not run %s\n", line );
+ continue;
+ }
+
+ while( fgets( line, sizeof(line), nm_f ) ) {
+ char *import_sign, *eol;
+
+ if( !(import_sign = strstr( line, " I " )) ) continue;
+
+ import_sign += 3;
+ while( *import_sign && isspace(*import_sign) ) import_sign++;
+
+ /* Strip ws after name */
+ for( eol = import_sign; *eol && !isspace(*eol); eol++ );
+
+ *eol = 0;
+
+ for( new_f = imports; new_f; new_f = new_f->next )
+ if( !strcmp( new_f->name, import_sign ) ) break;
+
+ if( new_f ) continue;
+
+ new_f = (stub *)malloc( sizeof(stub) );
+ if( !new_f ) {fprintf( stderr, "Out of memory\n" ); return 1;}
+
+ new_f->name = strdup( import_sign + 1 );
+ new_f->origin = origin;
+ new_f->next = imports;
+ imports = new_f;
+ }
+
+ fclose( nm_f );
+ }
+
+ /* Now we have a list of unique functions and a list of imports,
+ lookup each function and output the entry from the import list. */
+ for( new_f = functions; new_f; new_f = new_f->next ) {
+ for( search = imports; search; search = search->next ) {
+ if( !strcmp( new_f->name, search->name ) ) {
+ fprintf( out, "%s %s\n", search->origin, search->name );
+ continue;
+ }
+ }
+ }
+
+ fclose( out );
+
+ return 0;
}
More information about the Ros-diffs
mailing list