Changeset 16045

Timestamp:

Jan 8, 2008, 1:59:09 PM (18 years ago)

Author:

eugene

Message:

converted sortstr to new macro version; moved into unique.c

Location:

trunk/Ohana/src/imregister

Files:

• base/sort.c (deleted)
• imreg/unique.c (modified) (2 diffs)
• spreg/unique.c (modified) (2 diffs)

trunk/Ohana/src/imregister/imreg/unique.c

@@ -1 +1 @@
 # include "imregister.h"
 # include "imreg.h"
+
+void sortstr (char **S, int *X, int N) {
+
+# define SWAPFUNC(A,B){ \
+  char *tmp = S[A]; S[A] = S[B]; S[B] = tmp; \
+  int  itmp = X[A]; X[A] = X[B]; X[B] = itmp; \
+}
+# define COMPARE(A,B)(strcmp(S[A], S[B]) < 0)
+
+  OHANA_SORT (N, COMPARE, SWAPFUNC);
+
+# undef SWAPFUNC
+# undef COMPARE
+
+}
 
 /* input is a subset index of image list, output is a new subset */
@@ -63 +78 @@
   return (match);
 }
-
-void sortstr (char **S, int *X, int N) {
-
-# define SWAPFUNC(A,B){ \
-  char *tmp = S[A]; S[A] = S[B]; S[B] = tmp; \
-  int  itmp = X[A]; X[A] = X[B]; X[B] = itmp; \
-}
-# define COMPARE(A,B)(strcmp(S[A], S[B]) < 0)
-
-  OHANA_SORT (N, COMPARE, SWAPFUNC);
-
-# undef SWAPFUNC
-# undef COMPARE
-
-}

trunk/Ohana/src/imregister/spreg/unique.c

@@ -1 +1 @@
 # include "imregister.h"
 # include "spreg.h"
+
+void sortstr (char **S, int *X, int N) {
+
+# define SWAPFUNC(A,B){ \
+  char *tmp = S[A]; S[A] = S[B]; S[B] = tmp; \
+  int  itmp = X[A]; X[A] = X[B]; X[B] = itmp; \
+}
+# define COMPARE(A,B)(strcmp(S[A], S[B]) < 0)
+
+  OHANA_SORT (N, COMPARE, SWAPFUNC);
+
+# undef SWAPFUNC
+# undef COMPARE
+
+}
 
 /* input is a subset index of spectrum list, output is a new subset */
@@ -55 +70 @@
   return (match);
 }
-