From c728a74e429cde07ec49368f6a7d3b198dc611fc Mon Sep 17 00:00:00 2001 From: Michael Lotz Date: Wed, 6 Jul 2005 23:07:32 +0000 Subject: [PATCH] Cleanup. We don't need string_helper anymore as it's only function (strcasestr) is in libroot. It was a temporary solution more than two years ago. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@13514 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/support/Jamfile | 6 ------ src/kits/support/String.cpp | 3 --- src/kits/support/string_helper.cpp | 26 -------------------------- src/kits/support/string_helper.h | 9 --------- src/kits/support/support.src | 1 - 5 files changed, 45 deletions(-) delete mode 100644 src/kits/support/string_helper.cpp delete mode 100644 src/kits/support/string_helper.h diff --git a/src/kits/support/Jamfile b/src/kits/support/Jamfile index 15fa4cfcd9..f7c315cb93 100644 --- a/src/kits/support/Jamfile +++ b/src/kits/support/Jamfile @@ -1,7 +1 @@ SubDir OBOS_TOP src kits support ; - -StaticLibrary haiku : - String.cpp - string_helper.cpp - : STATIC_LIBRARY_DIR - ; diff --git a/src/kits/support/String.cpp b/src/kits/support/String.cpp index 1cda0ffc9c..581eb41b24 100644 --- a/src/kits/support/String.cpp +++ b/src/kits/support/String.cpp @@ -36,9 +36,6 @@ #include #include -// Temporary Includes -#include "string_helper.h" - #define ENABLE_INLINES 0 // Set this to 1 to make some private methods inline // define proper names for case-option of _DoReplace() diff --git a/src/kits/support/string_helper.cpp b/src/kits/support/string_helper.cpp deleted file mode 100644 index c94b58e5bb..0000000000 --- a/src/kits/support/string_helper.cpp +++ /dev/null @@ -1,26 +0,0 @@ -//Those functions are here just to compile BString. -//They will be removed as soon as our libc compiles. - -#include -#include - -char * -strcasestr(const char *s, const char *find) -{ - char c, sc; - size_t len; - - if ((c = *find++) != 0) { - c = tolower((unsigned char)c); - len = strlen(find); - do { - do { - if ((sc = *s++) == 0) - return NULL; - } while ((char)tolower((unsigned char)sc) != c); - } while (strncasecmp(s, find, len) != 0); - s--; - } - return (char *)s; -} - diff --git a/src/kits/support/string_helper.h b/src/kits/support/string_helper.h deleted file mode 100644 index f20d98d758..0000000000 --- a/src/kits/support/string_helper.h +++ /dev/null @@ -1,9 +0,0 @@ -//Those functions are here just to compile BString. -//They will be removed as soon as our libc compiles. - -#ifndef __stringhelper_h -#define __stringhelper_h - -extern char *strcasestr(const char *s, const char *find); - -#endif //__stringhelper_h diff --git a/src/kits/support/support.src b/src/kits/support/support.src index c365f6ef0e..7db0192f00 100644 --- a/src/kits/support/support.src +++ b/src/kits/support/support.src @@ -11,6 +11,5 @@ SUPPORT_KIT_SOURCE = PointerList.cpp StopWatch.cpp String.cpp - string_helper.cpp # StreamIO.cpp ;