More moves of string functions out of lib/lib.h.

match_pattern* has been renamed to str_match_pattern*,
(word|sep)split has been renamed to str_(word|sep)split,
all of them have been moved to lib/string.h.

md5_to_hex() and hex_to_md5() have been moved to lib/string.h,
but MD5_SIZE and MD5_HEX_SIZE to lib/md5.h. The conversion
functions will be replaced by a generic hexdumper soon.

diff --git a/lib/Makefile b/lib/Makefile
index 470feabc0653937d7aaa5dfd8e3a14d91f2733c7..6df66820bc493d4675d95cb341d1d4ad6faaa0c2 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -41,7 +41,7 @@ LIBUCW_INCLUDES= \
        arraysort.h \
        lists.h clists.h slists.h simple-lists.h \
        string.h stkstring.h unicode.h chartype.h regex.h \
-       wildmatch.h patmatch.h \
+       wildmatch.h \
        unaligned.h prefetch.h \
        bbuf.h gbuf.h bitarray.h bitsig.h \
        hashfunc.h hashtable.h \

diff --git a/lib/lib.h b/lib/lib.h
index cd3ba862d4ab2e7e1acafebbcf6e64dae378ed15..3dfea33742de31b61449c6382ca51165920ba928 100644 (file)
--- a/lib/lib.h
+++ b/lib/lib.h
@@ -165,24 +165,6 @@ char *xstrdup(const char *) LIKE_MALLOC;
 
 int match_ct_patt(const char *, const char *);
 
-/* wordsplit.c */
-
-int sepsplit(char *str, uns sep, char **rec, uns max);
-int wordsplit(char *str, char **rec, uns max);
-
-/* pat(i)match.c: Matching of shell patterns */
-
-int match_pattern(const char *patt, const char *str);
-int match_pattern_nocase(const char *patt, const char *str);
-
-/* md5hex.c */
-
-void md5_to_hex(const byte *s, char *d);
-void hex_to_md5(const char *s, byte *d);
-
-#define MD5_SIZE 16
-#define MD5_HEX_SIZE 33
-
 /* prime.c */
 
 int isprime(uns x);

diff --git a/lib/md5.h b/lib/md5.h
index be51a52525eeb6131a43c680fad0beb0b589e921..0bb64593df017caf728f86ce4e1860601cd7225a 100644 (file)
--- a/lib/md5.h
+++ b/lib/md5.h
@@ -21,4 +21,7 @@ void MD5Update(struct MD5Context *context, unsigned char const *buf,
 void MD5Final(unsigned char digest[16], struct MD5Context *context);
 void MD5Transform(uint32 buf[4], uint32 const in[16]);
 
+#define MD5_HEX_SIZE 33
+#define MD5_SIZE 16
+
 #endif /* !_UCW_MD5_H */

diff --git a/lib/md5hex.c b/lib/md5hex.c
index 93987b00a13246de55581ded5dd415dae163b10a..d0722f3e245c1d33233eca52fb06741b2ec9b21b 100644 (file)
--- a/lib/md5hex.c
+++ b/lib/md5hex.c
@@ -9,6 +9,8 @@
 
 #include "lib/lib.h"
 #include "lib/chartype.h"
+#include "lib/md5.h"
+#include "lib/string.h"
 
 #include <stdio.h>
 

diff --git a/lib/patimatch.c b/lib/patimatch.c
index a0e29af90aed6761c305c291c41dc020b4057218..ea5a4be9702e7a4ac2a60d021f17a8f5bbd5e7a6 100644 (file)
--- a/lib/patimatch.c
+++ b/lib/patimatch.c
@@ -11,6 +11,6 @@
 #include "lib/chartype.h"
 
 #define Convert(x) Cupcase(x)
-#define MATCH_FUNC_NAME match_pattern_nocase
+#define MATCH_FUNC_NAME str_match_pattern_nocase
 
 #include "lib/patmatch.h"

diff --git a/lib/patmatch.c b/lib/patmatch.c
index bfd8aa50e7dc3e1ab712ab3efa7c4cc00bd08715..373054ade008bbb7b5aeea3d1e0b9cdf5e819ef5 100644 (file)
--- a/lib/patmatch.c
+++ b/lib/patmatch.c
@@ -10,6 +10,6 @@
 #include "lib/lib.h"
 
 #define Convert(x) (x)
-#define MATCH_FUNC_NAME match_pattern
+#define MATCH_FUNC_NAME str_match_pattern
 
 #include "lib/patmatch.h"

diff --git a/lib/patmatch.h b/lib/patmatch.h
index a47669f948d0a060471a973cef60ae05cd774b80..ef8508a1fa5583f1afdf2d59c8b5a00fc99a36bc 100644 (file)
--- a/lib/patmatch.h
+++ b/lib/patmatch.h
@@ -7,6 +7,8 @@
  *     of the GNU Lesser General Public License.
  */
 
+#include "lib/string.h"
+
 int
 MATCH_FUNC_NAME(const char *p, const char *s)
 {

diff --git a/lib/sorter/sort-test.c b/lib/sorter/sort-test.c
index e7d5873020d2bb527e2ac0efb312bbe5ff0b8e4f..896013fbfd67942046ee6a557c273152cd8721b9 100644 (file)
--- a/lib/sorter/sort-test.c
+++ b/lib/sorter/sort-test.c
@@ -14,6 +14,7 @@
 #include "lib/ff-binary.h"
 #include "lib/hashfunc.h"
 #include "lib/md5.h"
+#include "lib/string.h"
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -674,7 +675,7 @@ main(int argc, char **argv)
       case 't':
          {
            char *w[32];
-           int f = sepsplit(optarg, ',', w, ARRAY_SIZE(w));
+           int f = str_sepsplit(optarg, ',', w, ARRAY_SIZE(w));
            if (f < 0)
              goto usage;
            t = 0;

diff --git a/lib/string.h b/lib/string.h
index c60a14d0bf19c0d4b8ac665f1a6d8e8dc50e1415..a9de082f9dc457489c61755f6ad2f99d610188da 100644 (file)
--- a/lib/string.h
+++ b/lib/string.h
@@ -14,4 +14,19 @@
 char *str_unesc(char *dest, const char *src);
 char *str_format_flags(char *dest, const char *fmt, uns flags);
 
+/* wordsplit.c */
+
+int str_sepsplit(char *str, uns sep, char **rec, uns max);
+int str_wordsplit(char *str, char **rec, uns max);
+
+/* pat(i)match.c: Matching of shell patterns */
+
+int str_match_pattern(const char *patt, const char *str);
+int str_match_pattern_nocase(const char *patt, const char *str);
+
+/* md5hex.c */
+
+void md5_to_hex(const byte *s, char *d);
+void hex_to_md5(const char *s, byte *d);
+
 #endif

diff --git a/lib/wordsplit.c b/lib/wordsplit.c
index 2e50edc16dfd04ce132a08d79890f3b88f5bd88c..97ce242a96bb382ba442bd63d4e974ab0ee497ae 100644 (file)
--- a/lib/wordsplit.c
+++ b/lib/wordsplit.c
@@ -10,11 +10,12 @@
 
 #include "lib/lib.h"
 #include "lib/chartype.h"
+#include "lib/string.h"
 
 #include <string.h>
 
 int
-sepsplit(char *str, uns sep, char **rec, uns max)
+str_sepsplit(char *str, uns sep, char **rec, uns max)
 {
   uns cnt = 0;
   while (1)
@@ -30,7 +31,7 @@ sepsplit(char *str, uns sep, char **rec, uns max)
 }
 
 int
-wordsplit(char *src, char **dst, uns max)
+str_wordsplit(char *src, char **dst, uns max)
 {
   uns cnt = 0;