MonetDB: sw_ew_c_sorting - string comparison returns int now

[Lucas Pereira via checkin-list]

Changeset: 1a7d6bc0b55d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/1a7d6bc0b55d
Modified Files:
        monetdb5/modules/atoms/str.h
        monetdb5/modules/kernel/batstr.c
Branch: sw_ew_c_sorting
Log Message:

string comparison returns int now


diffs (57 lines):

diff --git a/monetdb5/modules/atoms/str.h b/monetdb5/modules/atoms/str.h
--- a/monetdb5/modules/atoms/str.h
+++ b/monetdb5/modules/atoms/str.h
@@ -156,17 +156,17 @@ extern str str_from_wchr(str *buf, size_
 extern str str_wchr_at(int *res, const char *s, int at)
                __attribute__((__visibility__("hidden")));
 
-extern bit str_is_prefix(const char *s, const char *prefix, int plen)
+extern int str_is_prefix(const char *s, const char *prefix, int plen)
                __attribute__((__visibility__("hidden")));
-extern bit str_is_iprefix(const char *s, const char *prefix, int plen)
+extern int str_is_iprefix(const char *s, const char *prefix, int plen)
                __attribute__((__visibility__("hidden")));
-extern bit str_is_suffix(const char *s, const char *suffix, int sul)
+extern int str_is_suffix(const char *s, const char *suffix, int sul)
                __attribute__((__visibility__("hidden")));
-extern bit str_is_isuffix(const char *s, const char *suffix, int sul)
+extern int str_is_isuffix(const char *s, const char *suffix, int sul)
                __attribute__((__visibility__("hidden")));
-extern bit str_contains(const char *h, const char *n, int nlen)
+extern int str_contains(const char *h, const char *n, int nlen)
                __attribute__((__visibility__("hidden")));
-extern bit str_icontains(const char *h, const char *n, int nlen)
+extern int str_icontains(const char *h, const char *n, int nlen)
                __attribute__((__visibility__("hidden")));
 
 extern str str_tail(str *buf, size_t *buflen, const char *s, int off)
diff --git a/monetdb5/modules/kernel/batstr.c b/monetdb5/modules/kernel/batstr.c
--- a/monetdb5/modules/kernel/batstr.c
+++ b/monetdb5/modules/kernel/batstr.c
@@ -1807,7 +1807,7 @@ STRbatRpad3_bat_bat(Client cntxt, MalBlk
  */
 static str
 prefix_or_suffix(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci,
-                                const char *name, bit (*func)(const char *, 
const char *, int),
+                                const char *name, int (*func)(const char *, 
const char *, int),
                                 bit *icase)
 {
         (void) cntxt;
@@ -1935,7 +1935,7 @@ BATSTRcontains(Client cntxt, MalBlkPtr m
 
 static str
 prefix_or_suffix_cst(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci,
-                                        const char *name, bit (*func)(const 
char *, const char *,
+                                        const char *name, int (*func)(const 
char *, const char *,
                                                                                
                   int), bit *icase)
 {
         (void) cntxt;
@@ -2058,7 +2058,7 @@ BATSTRcontains_cst(Client cntxt, MalBlkP
 
 static str
 prefix_or_suffix_strcst(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr 
pci,
-                                               const char *name, bit 
(*func)(const char *,
+                                               const char *name, int 
(*func)(const char *,
                                                                                
                          const char *, int),
                                                bit *icase)
 {
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org