mirror of https://github.com/xzeldon/htop.git
There was a bug in my implementaion. No reason not to use the glibc version.
This commit is contained in:
parent
7fd5e80429
commit
cd692f27f4
12
String.c
12
String.c
|
@ -16,6 +16,7 @@ in the source distribution for its full text.
|
||||||
|
|
||||||
/*{
|
/*{
|
||||||
#define String_startsWith(s, match) (strstr((s), (match)) == (s))
|
#define String_startsWith(s, match) (strstr((s), (match)) == (s))
|
||||||
|
#define String_contains_i(s1, s2) (strcasestr(s1, s2) != NULL)
|
||||||
}*/
|
}*/
|
||||||
|
|
||||||
char* String_cat(const char* s1, const char* s2) {
|
char* String_cat(const char* s1, const char* s2) {
|
||||||
|
@ -91,17 +92,6 @@ void String_freeArray(char** s) {
|
||||||
free(s);
|
free(s);
|
||||||
}
|
}
|
||||||
|
|
||||||
int String_contains_i(const char* s, const char* match) {
|
|
||||||
int lens = strlen(s);
|
|
||||||
int lenmatch = strlen(match);
|
|
||||||
for (int i = 0; i < lens-lenmatch; i++) {
|
|
||||||
if (strncasecmp(s, match, strlen(match)) == 0)
|
|
||||||
return 1;
|
|
||||||
s++;
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
char* String_getToken(const char* line, const unsigned short int numMatch) {
|
char* String_getToken(const char* line, const unsigned short int numMatch) {
|
||||||
const unsigned short int len = strlen(line);
|
const unsigned short int len = strlen(line);
|
||||||
char inWord = 0;
|
char inWord = 0;
|
||||||
|
|
3
String.h
3
String.h
|
@ -10,6 +10,7 @@ in the source distribution for its full text.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define String_startsWith(s, match) (strstr((s), (match)) == (s))
|
#define String_startsWith(s, match) (strstr((s), (match)) == (s))
|
||||||
|
#define String_contains_i(s1, s2) (strcasestr(s1, s2) != NULL)
|
||||||
|
|
||||||
char* String_cat(const char* s1, const char* s2);
|
char* String_cat(const char* s1, const char* s2);
|
||||||
|
|
||||||
|
@ -21,8 +22,6 @@ char** String_split(const char* s, char sep, int* n);
|
||||||
|
|
||||||
void String_freeArray(char** s);
|
void String_freeArray(char** s);
|
||||||
|
|
||||||
int String_contains_i(const char* s, const char* match);
|
|
||||||
|
|
||||||
char* String_getToken(const char* line, const unsigned short int numMatch);
|
char* String_getToken(const char* line, const unsigned short int numMatch);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue