diff options
author | Eugene V. Lyubimkin <jackyf@debian.org> | 2011-01-16 19:36:07 +0200 |
---|---|---|
committer | Daniel Lange <DLange@git.local> | 2016-04-11 13:00:28 +0200 |
commit | 6e8d31964ea33edd470001ee13070e844b269e11 (patch) | |
tree | 48b41783f978b511ccfb25260c83717160c8d63b /String.c | |
parent | 6e545da37e2482b15007df28c549afa072a5198d (diff) | |
parent | 283707c5e5bc436b78ea23bf5500cb6b16a01148 (diff) | |
download | debian_htop-6e8d31964ea33edd470001ee13070e844b269e11.tar.gz debian_htop-6e8d31964ea33edd470001ee13070e844b269e11.tar.bz2 debian_htop-6e8d31964ea33edd470001ee13070e844b269e11.zip |
Imported Debian patch 0.9-1debian/0.9-1
Diffstat (limited to 'String.c')
-rw-r--r-- | String.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -1,6 +1,6 @@ /* htop -(C) 2004-2006 Hisham H. Muhammad +(C) 2004-2010 Hisham H. Muhammad Released under the GNU GPL, see the COPYING file in the source distribution for its full text. */ @@ -18,11 +18,11 @@ in the source distribution for its full text. #define String_startsWith(s, match) (strstr((s), (match)) == (s)) }*/ -inline char* String_copy(char* orig) { +inline char* String_copy(const char* orig) { return strdup(orig); } -char* String_cat(char* s1, char* s2) { +char* String_cat(const char* s1, const char* s2) { int l1 = strlen(s1); int l2 = strlen(s2); char* out = malloc(l1 + l2 + 1); @@ -31,7 +31,7 @@ char* String_cat(char* s1, char* s2) { return out; } -char* String_trim(char* in) { +char* String_trim(const char* in) { while (in[0] == ' ' || in[0] == '\t' || in[0] == '\n') { in++; } @@ -55,7 +55,7 @@ inline int String_eq(const char* s1, const char* s2) { return (strcmp(s1, s2) == 0); } -char** String_split(char* s, char sep) { +char** String_split(const char* s, char sep) { const int rate = 10; char** out = (char**) malloc(sizeof(char*) * rate); int ctr = 0; @@ -93,7 +93,7 @@ void String_freeArray(char** s) { free(s); } -int String_contains_i(char* s, char* match) { +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++) { |