svn commit: trunk/busybox: e2fsprogs include libbb

[vodz at busybox.net]

Author: vodz
Date: 2005-11-26 02:45:26 -0800 (Sat, 26 Nov 2005)
New Revision: 12535

Log:
change the interface of libbb/compare_string_array (unsigned short to int), usaging for e2fsprogs/fsck

Modified:
   trunk/busybox/e2fsprogs/fsck.c
   trunk/busybox/include/libbb.h
   trunk/busybox/libbb/compare_string_array.c


Changeset:
Modified: trunk/busybox/e2fsprogs/fsck.c
===================================================================
--- trunk/busybox/e2fsprogs/fsck.c	2005-11-26 10:33:55 UTC (rev 12534)
+++ trunk/busybox/e2fsprogs/fsck.c	2005-11-26 10:45:26 UTC (rev 12535)
@@ -1006,11 +1006,11 @@
 	if (!fs_match(fs, &fs_type_compiled)) return 1;
 
 	/* Are we ignoring this type? */
-	if(compare_string_array(ignored_types, fs->type))
+	if(compare_string_array(ignored_types, fs->type) >= 0)
 		return 1;
 
 	/* Do we really really want to check this fs? */
-	wanted = compare_string_array(really_wanted, fs->type);
+	wanted = compare_string_array(really_wanted, fs->type) >= 0;
 
 	/* See if the <fsck.fs> program is available. */
 	s = find_fsck(fs->type);

Modified: trunk/busybox/include/libbb.h
===================================================================
--- trunk/busybox/include/libbb.h	2005-11-26 10:33:55 UTC (rev 12534)
+++ trunk/busybox/include/libbb.h	2005-11-26 10:45:26 UTC (rev 12535)
@@ -466,7 +466,7 @@
 } procps_status_t;
 
 extern procps_status_t * procps_scan(int save_user_arg0);
-extern unsigned short compare_string_array(const char * const string_array[], const char *key);
+extern int compare_string_array(const char * const string_array[], const char *key);
 
 extern int my_query_module(const char *name, int which, void **buf, size_t *bufsize, size_t *ret);
 

Modified: trunk/busybox/libbb/compare_string_array.c
===================================================================
--- trunk/busybox/libbb/compare_string_array.c	2005-11-26 10:33:55 UTC (rev 12534)
+++ trunk/busybox/libbb/compare_string_array.c	2005-11-26 10:45:26 UTC (rev 12535)
@@ -17,16 +17,16 @@
 #include <string.h>
 
 /* returns the array number of the string */
-extern unsigned short 
+extern int 
 compare_string_array(const char * const string_array[], const char *key)
 {
-	unsigned short i;
+	int i;
 
 	for (i = 0; string_array[i] != 0; i++) {
 		if (strcmp(string_array[i], key) == 0) {
-			break;
+			return i;
 		}
 	}
-	return(i);
+	return -i;
 }