Changeset: 01be8e3c8ddb for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=01be8e3c8ddb
Modified Files:
gdk/gdk_atoms.h
gdk/gdk_private.h
gdk/gdk_string.c
Branch: Nov2019
Log Message:
No need for our own version of strcmp.
diffs (48 lines):
diff --git a/gdk/gdk_atoms.h b/gdk/gdk_atoms.h
--- a/gdk/gdk_atoms.h
+++ b/gdk/gdk_atoms.h
@@ -327,9 +327,7 @@ gdk_export const ptr ptr_nil;
#define GDK_STRNIL(s) ((s) == NULL || *(const char*) (s) == '\200')
#define GDK_STRLEN(s) ((GDK_STRNIL(s)?1:strlen(s))+1)
#define GDK_STRCMP(l,r) (GDK_STRNIL(l)?(GDK_STRNIL(r)?0:-1):GDK_STRNIL(r)?1: \
- (*(const unsigned char*)(l) < *(const unsigned
char*)(r))?-1: \
- (*(const unsigned char*)(l) > *(const unsigned
char*)(r))?1: \
- strCmpNoNil((const unsigned char*)(l),(const unsigned
char*)(r)))
+ strcmp((const char*)(l), (const char*)(r)))
/*
* @- Hash Function
* The string hash function is a very simple hash function that xors
diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h
--- a/gdk/gdk_private.h
+++ b/gdk/gdk_private.h
@@ -246,8 +246,6 @@ stpconcat(char *restrict dst, const char
__attribute__((__visibility__("hidden")));
__hidden int strCmp(const char *l, const char *r)
__attribute__((__visibility__("hidden")));
-__hidden int strCmpNoNil(const unsigned char *l, const unsigned char *r)
- __attribute__((__visibility__("hidden")));
__hidden void strHeap(Heap *d, size_t cap)
__attribute__((__visibility__("hidden")));
__hidden var_t strLocate(Heap *h, const char *v)
diff --git a/gdk/gdk_string.c b/gdk/gdk_string.c
--- a/gdk/gdk_string.c
+++ b/gdk/gdk_string.c
@@ -82,18 +82,6 @@ strCmp(const char *l, const char *r)
return GDK_STRCMP(l, r);
}
-int
-strCmpNoNil(const unsigned char *l, const unsigned char *r)
-{
- while (*l == *r) {
- if (*l == 0)
- return 0;
- l++;
- r++;
- }
- return (*l < *r) ? -1 : 1;
-}
-
void
strHeap(Heap *d, size_t cap)
{
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
