[oprof-cvs] CVS: oprofile/pp oprof_convert.c,1.6,1.7

[John L. <mov...@us...>]

Update of /cvsroot/oprofile/oprofile/pp
In directory usw-pr-cvs1:/tmp/cvs-serv3420/pp

Modified Files:
	oprof_convert.c 
Log Message:
convert fix



Index: oprof_convert.c
===================================================================
RCS file: /cvsroot/oprofile/oprofile/pp/oprof_convert.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- oprof_convert.c	2001/07/25 16:43:30	1.6
+++ oprof_convert.c	2001/07/27 23:22:39	1.7
@@ -126,6 +126,7 @@
 	struct opd_footer_v4 footer_v4;
 	char * name;
 
+	printf("v4\n"); 
 	fread(&footer_v3, sizeof(footer_v3), 1, fp);
 
 	footer_v4.v2 = footer_v3.v2;
@@ -231,6 +232,7 @@
 	int converter_index;
 	int err = 0;
 	int i;
+	int converted;
 
 	if (argc <= 1) {
 		fprintf(stderr, "Syntax: %s filename [filenames]\n", argv[0]);
@@ -262,17 +264,15 @@
 			continue;
 		}
 
-		converter_index = get_converter_index(fp);
-		if (converter_index == -1) {
-			fclose(fp);
-
-			fprintf(stderr, "can not find a converter for %s (perhaps this file is already converted ?)\n", argv[i]);
-			err++;
-			continue;
+		converted = 0;
+		while ((converter_index = get_converter_index(fp)) != -1) {
+			converter_array[converter_index].convert(fp);
+			converted = 1;
 		}
 
-		for ( ; converter_index < nr_converter ; ++converter_index) {
-			converter_array[converter_index].convert(fp);
+		if (converted == 0) {
+			fprintf(stderr, "no converter found for %s (file already converted ?)\n", argv[i]);
+			err++;
 		}
 
 		fclose(fp);