1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
|
Index: orpheus-1.6/kkstrtext-0.1/kkstrtext.cc
===================================================================
--- orpheus-1.6.orig/kkstrtext-0.1/kkstrtext.cc
+++ orpheus-1.6/kkstrtext-0.1/kkstrtext.cc
@@ -41,17 +41,17 @@ char *strimlead(char *str) { return tri
char *strimtrail(char *str) { return trimtrail(str, " \t"); }
char *strim(char *str) { return trim(str, " \t"); }
-char *trimlead(char *str, char *chr) {
+char *trimlead(char *str, const char *chr) {
while(strchr(chr, str[0]) && strlen(str)) strcpy(str, str + 1);
return str;
}
-char *trimtrail(char *str, char *chr) {
+char *trimtrail(char *str, const char *chr) {
while(strchr(chr, str[strlen(str)-1]) && strlen(str)) str[strlen(str)-1] = 0;
return str;
}
-char *trim(char *str, char *chr) {
+char *trim(char *str, const char *chr) {
return trimlead(trimtrail(str, chr), chr);
}
@@ -370,7 +370,7 @@ const char *strqstr(const char *s, const
return ret;
}
-char *strinsert(char *buf, int pos, char *ins) {
+char *strinsert(char *buf, int pos, const char *ins) {
char *p = strdup(buf+pos);
memcpy(buf+pos+strlen(ins), p, strlen(p)+1);
memcpy(buf+pos, ins, strlen(ins));
Index: orpheus-1.6/kkstrtext-0.1/kkstrtext.h
===================================================================
--- orpheus-1.6.orig/kkstrtext-0.1/kkstrtext.h
+++ orpheus-1.6/kkstrtext-0.1/kkstrtext.h
@@ -119,9 +119,9 @@ __KTOOL_BEGIN_C
char *strcut(char *strin, int frompos, int count);
-char *trimlead(char *str, char *chr);
-char *trimtrail(char *str, char *chr);
-char *trim(char *str, char *chr);
+char *trimlead(char *str, const char *chr);
+char *trimtrail(char *str, const char *chr);
+char *trim(char *str, const char *chr);
char *strimlead(char *str);
char *strimtrail(char *str);
@@ -145,7 +145,7 @@ const char *strqstr(const char *s,
const char *esc = "");
char *strccat(char *dest, char c);
-char *strinsert(char *buf, int pos, char *ins);
+char *strinsert(char *buf, int pos, const char *ins);
char *strcinsert(char *buf, int pos, char ins);
int strchcount(char *s, char *accept);
|
GitWeb
