Changeset 6808

Timestamp:

08/09/10 14:52:57 (17 months ago)

Author:

westram

Message:

• removed duplicate of ARB_strscmp (GBS_strscmp). No longer needed cause ARBDB is now C++
• arb_str.h was lacking size_t

Location:

branches/refactor

Files:

• ARBDB/Makefile (modified) (1 diff)
• ARBDB/ad_prot.h (modified) (1 diff)
• ARBDB/adstring.cxx (modified) (1 diff)
• ARBDB/adtools.cxx (modified) (2 diffs)
• TEMPLATES/arb_str.h (modified) (1 diff)

branches/refactor/ARBDB/Makefile

@@ -880 +880 @@
 adtools.o: $(ARBHOME)/INCLUDE/arb_core.h
 adtools.o: $(ARBHOME)/INCLUDE/arb_error.h
+adtools.o: $(ARBHOME)/INCLUDE/arb_str.h
 adtools.o: $(ARBHOME)/INCLUDE/arbtools.h
 adtools.o: $(ARBHOME)/INCLUDE/attributes.h

branches/refactor/ARBDB/ad_prot.h

@@ -201 +201 @@
 char *GBS_fconvert_string(char *buffer);
 char *GBS_replace_tabs_by_spaces(const char *text);
-int GBS_strscmp(const char *s1, const char *s2);
 const char *GBS_readable_size(unsigned long long size);
 char *GBS_trim(const char *str);

branches/refactor/ARBDB/adstring.cxx

@@ -1953 +1953 @@
 }
 
-int GBS_strscmp(const char *s1, const char *s2) {
-    int    cmp = 0;
-    size_t idx = 0;
-    while (!cmp) {
-        if (!s1[idx] || !s2[idx]) break;
-        cmp = s1[idx] - s2[idx];
-        ++idx;
-    }
-    return cmp;
-}
-
 const char *GBS_readable_size(unsigned long long size) {
     // return human readable size information

branches/refactor/ARBDB/adtools.cxx

@@ -9 +9 @@
 // =============================================================== //
 
+#include <arb_str.h>
 #include <arbdbt.h>
 
@@ -130 +131 @@
     }
     else {
-        if (GBS_strscmp(insert->datapath, key+1) == 0) { // datapath matches
+        if (ARB_strscmp(insert->datapath, key+1) == 0) { // datapath matches
             to_insert    = strdup(key+strlen(insert->datapath)); // cut off prefix
             to_insert[0] = key[0]; // copy type

branches/refactor/TEMPLATES/arb_str.h

@@ -13 +13 @@
 #define ARB_STR_H
 
+#ifndef _CPP_CSTDDEF
+#include <cstddef>
+#endif
+#ifndef _CPP_CCTYPE
 #include <cctype>
-
-#ifndef __cplusplus
-// this header only works with c++
-// those functions needed by ARBDB are duplicated in adstring.c (with GBS_-prefix)
-#error inline.h may be used in C++ only
 #endif