Fri, 05 Jul 2019 15:02:04 +0200
adjusts library version
20
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1 | /* |
103
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
100
diff
changeset
|
2 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
100
diff
changeset
|
3 | * |
259 | 4 | * Copyright 2017 Mike Becker, Olaf Wintermann All rights reserved. |
103
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
100
diff
changeset
|
5 | * |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
100
diff
changeset
|
6 | * Redistribution and use in source and binary forms, with or without |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
100
diff
changeset
|
7 | * modification, are permitted provided that the following conditions are met: |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
100
diff
changeset
|
8 | * |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
100
diff
changeset
|
9 | * 1. Redistributions of source code must retain the above copyright |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
100
diff
changeset
|
10 | * notice, this list of conditions and the following disclaimer. |
20
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
11 | * |
103
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
100
diff
changeset
|
12 | * 2. Redistributions in binary form must reproduce the above copyright |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
100
diff
changeset
|
13 | * notice, this list of conditions and the following disclaimer in the |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
100
diff
changeset
|
14 | * documentation and/or other materials provided with the distribution. |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
100
diff
changeset
|
15 | * |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
100
diff
changeset
|
16 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
100
diff
changeset
|
17 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
100
diff
changeset
|
18 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
100
diff
changeset
|
19 | * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
100
diff
changeset
|
20 | * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
100
diff
changeset
|
21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
100
diff
changeset
|
22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
100
diff
changeset
|
23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
100
diff
changeset
|
24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
100
diff
changeset
|
25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
100
diff
changeset
|
26 | * POSSIBILITY OF SUCH DAMAGE. |
20
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
27 | */ |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
28 | |
251
fae240d633fc
changes source directory structure in preperation for autotools rollout
Mike Becker <universe@uap-core.de>
parents:
250
diff
changeset
|
29 | #include "ucx/string.h" |
fae240d633fc
changes source directory structure in preperation for autotools rollout
Mike Becker <universe@uap-core.de>
parents:
250
diff
changeset
|
30 | |
fae240d633fc
changes source directory structure in preperation for autotools rollout
Mike Becker <universe@uap-core.de>
parents:
250
diff
changeset
|
31 | #include "ucx/allocator.h" |
fae240d633fc
changes source directory structure in preperation for autotools rollout
Mike Becker <universe@uap-core.de>
parents:
250
diff
changeset
|
32 | |
20
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
33 | #include <stdlib.h> |
69
fb59270b1de3
made the code work with VC++ compiler (use make CONF=windows)
Mike Becker <universe@uap-core.de>
parents:
68
diff
changeset
|
34 | #include <string.h> |
20
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
35 | #include <stdarg.h> |
236
ffc6d0910342
improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents:
235
diff
changeset
|
36 | #include <stdint.h> |
189
f43bbd33fec0
sstrtrim now uses isspace()
Mike Becker <universe@uap-core.de>
parents:
185
diff
changeset
|
37 | #include <ctype.h> |
20
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
38 | |
116
234920008754
some fixes and some documentation
Mike Becker <universe@uap-core.de>
parents:
109
diff
changeset
|
39 | sstr_t sstr(char *cstring) { |
20
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
40 | sstr_t string; |
116
234920008754
some fixes and some documentation
Mike Becker <universe@uap-core.de>
parents:
109
diff
changeset
|
41 | string.ptr = cstring; |
234920008754
some fixes and some documentation
Mike Becker <universe@uap-core.de>
parents:
109
diff
changeset
|
42 | string.length = strlen(cstring); |
20
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
43 | return string; |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
44 | } |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
45 | |
116
234920008754
some fixes and some documentation
Mike Becker <universe@uap-core.de>
parents:
109
diff
changeset
|
46 | sstr_t sstrn(char *cstring, size_t length) { |
20
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
47 | sstr_t string; |
116
234920008754
some fixes and some documentation
Mike Becker <universe@uap-core.de>
parents:
109
diff
changeset
|
48 | string.ptr = cstring; |
234920008754
some fixes and some documentation
Mike Becker <universe@uap-core.de>
parents:
109
diff
changeset
|
49 | string.length = length; |
20
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
50 | return string; |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
51 | } |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
52 | |
275
96f643d30ff1
adds scstr_t struct for const strings and adapts some string functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
272
diff
changeset
|
53 | scstr_t scstr(const char *cstring) { |
96f643d30ff1
adds scstr_t struct for const strings and adapts some string functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
272
diff
changeset
|
54 | scstr_t string; |
96f643d30ff1
adds scstr_t struct for const strings and adapts some string functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
272
diff
changeset
|
55 | string.ptr = cstring; |
96f643d30ff1
adds scstr_t struct for const strings and adapts some string functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
272
diff
changeset
|
56 | string.length = strlen(cstring); |
96f643d30ff1
adds scstr_t struct for const strings and adapts some string functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
272
diff
changeset
|
57 | return string; |
96f643d30ff1
adds scstr_t struct for const strings and adapts some string functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
272
diff
changeset
|
58 | } |
96f643d30ff1
adds scstr_t struct for const strings and adapts some string functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
272
diff
changeset
|
59 | |
96f643d30ff1
adds scstr_t struct for const strings and adapts some string functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
272
diff
changeset
|
60 | scstr_t scstrn(const char *cstring, size_t length) { |
96f643d30ff1
adds scstr_t struct for const strings and adapts some string functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
272
diff
changeset
|
61 | scstr_t string; |
96f643d30ff1
adds scstr_t struct for const strings and adapts some string functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
272
diff
changeset
|
62 | string.ptr = cstring; |
96f643d30ff1
adds scstr_t struct for const strings and adapts some string functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
272
diff
changeset
|
63 | string.length = length; |
96f643d30ff1
adds scstr_t struct for const strings and adapts some string functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
272
diff
changeset
|
64 | return string; |
96f643d30ff1
adds scstr_t struct for const strings and adapts some string functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
272
diff
changeset
|
65 | } |
96f643d30ff1
adds scstr_t struct for const strings and adapts some string functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
272
diff
changeset
|
66 | |
96f643d30ff1
adds scstr_t struct for const strings and adapts some string functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
272
diff
changeset
|
67 | |
319
0380e438a7ce
unifies naming of sstr_t related and scstr_t related functions
Mike Becker <universe@uap-core.de>
parents:
318
diff
changeset
|
68 | size_t scstrnlen(size_t n, ...) { |
20
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
69 | va_list ap; |
288
6af5798342e8
makes sstrcat and sstrnlen scstr_t compatible
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
276
diff
changeset
|
70 | va_start(ap, n); |
6af5798342e8
makes sstrcat and sstrnlen scstr_t compatible
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
276
diff
changeset
|
71 | |
6af5798342e8
makes sstrcat and sstrnlen scstr_t compatible
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
276
diff
changeset
|
72 | size_t size = 0; |
20
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
73 | |
288
6af5798342e8
makes sstrcat and sstrnlen scstr_t compatible
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
276
diff
changeset
|
74 | for (size_t i = 0 ; i < n ; i++) { |
6af5798342e8
makes sstrcat and sstrnlen scstr_t compatible
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
276
diff
changeset
|
75 | scstr_t str = va_arg(ap, scstr_t); |
317
ebae0e434898
overflow of sstrnlen should return SIZE_MAX instead of zero
Mike Becker <universe@uap-core.de>
parents:
316
diff
changeset
|
76 | if(SIZE_MAX - str.length < size) { |
ebae0e434898
overflow of sstrnlen should return SIZE_MAX instead of zero
Mike Becker <universe@uap-core.de>
parents:
316
diff
changeset
|
77 | size = SIZE_MAX; |
272
2def28b65328
adds integer overflow checks to sstrlen and sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
270
diff
changeset
|
78 | break; |
2def28b65328
adds integer overflow checks to sstrlen and sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
270
diff
changeset
|
79 | } |
20
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
80 | size += str.length; |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
81 | } |
24
e04822101291
changed make clean + added dlist_clone with copy test + added va_end statements to string.c
Mike Becker <universe@uap-core.de>
parents:
20
diff
changeset
|
82 | va_end(ap); |
20
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
83 | |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
84 | return size; |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
85 | } |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
86 | |
180
2185f19dcc45
added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
87 | static sstr_t sstrvcat_a( |
2185f19dcc45
added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
88 | UcxAllocator *a, |
2185f19dcc45
added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
89 | size_t count, |
288
6af5798342e8
makes sstrcat and sstrnlen scstr_t compatible
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
276
diff
changeset
|
90 | scstr_t s1, |
180
2185f19dcc45
added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
91 | va_list ap) { |
2185f19dcc45
added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
92 | sstr_t str; |
2185f19dcc45
added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
93 | str.ptr = NULL; |
2185f19dcc45
added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
94 | str.length = 0; |
2185f19dcc45
added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
95 | if(count < 2) { |
2185f19dcc45
added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
96 | return str; |
2185f19dcc45
added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
97 | } |
2185f19dcc45
added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
98 | |
288
6af5798342e8
makes sstrcat and sstrnlen scstr_t compatible
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
276
diff
changeset
|
99 | scstr_t s2 = va_arg (ap, scstr_t); |
6af5798342e8
makes sstrcat and sstrnlen scstr_t compatible
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
276
diff
changeset
|
100 | |
272
2def28b65328
adds integer overflow checks to sstrlen and sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
270
diff
changeset
|
101 | if(((size_t)-1) - s1.length < s2.length) { |
2def28b65328
adds integer overflow checks to sstrlen and sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
270
diff
changeset
|
102 | return str; |
2def28b65328
adds integer overflow checks to sstrlen and sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
270
diff
changeset
|
103 | } |
2def28b65328
adds integer overflow checks to sstrlen and sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
270
diff
changeset
|
104 | |
288
6af5798342e8
makes sstrcat and sstrnlen scstr_t compatible
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
276
diff
changeset
|
105 | scstr_t *strings = (scstr_t*) calloc(count, sizeof(scstr_t)); |
180
2185f19dcc45
added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
106 | if(!strings) { |
2185f19dcc45
added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
107 | return str; |
2185f19dcc45
added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
108 | } |
2185f19dcc45
added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
109 | |
2185f19dcc45
added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
110 | // get all args and overall length |
2185f19dcc45
added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
111 | strings[0] = s1; |
2185f19dcc45
added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
112 | strings[1] = s2; |
272
2def28b65328
adds integer overflow checks to sstrlen and sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
270
diff
changeset
|
113 | size_t slen = s1.length + s2.length; |
2def28b65328
adds integer overflow checks to sstrlen and sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
270
diff
changeset
|
114 | int error = 0; |
180
2185f19dcc45
added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
115 | for (size_t i=2;i<count;i++) { |
288
6af5798342e8
makes sstrcat and sstrnlen scstr_t compatible
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
276
diff
changeset
|
116 | scstr_t s = va_arg (ap, scstr_t); |
180
2185f19dcc45
added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
117 | strings[i] = s; |
272
2def28b65328
adds integer overflow checks to sstrlen and sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
270
diff
changeset
|
118 | if(((size_t)-1) - s.length < slen) { |
2def28b65328
adds integer overflow checks to sstrlen and sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
270
diff
changeset
|
119 | error = 1; |
2def28b65328
adds integer overflow checks to sstrlen and sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
270
diff
changeset
|
120 | break; |
2def28b65328
adds integer overflow checks to sstrlen and sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
270
diff
changeset
|
121 | } |
2def28b65328
adds integer overflow checks to sstrlen and sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
270
diff
changeset
|
122 | slen += s.length; |
2def28b65328
adds integer overflow checks to sstrlen and sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
270
diff
changeset
|
123 | } |
2def28b65328
adds integer overflow checks to sstrlen and sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
270
diff
changeset
|
124 | if(error) { |
2def28b65328
adds integer overflow checks to sstrlen and sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
270
diff
changeset
|
125 | free(strings); |
2def28b65328
adds integer overflow checks to sstrlen and sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
270
diff
changeset
|
126 | return str; |
180
2185f19dcc45
added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
127 | } |
2185f19dcc45
added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
128 | |
2185f19dcc45
added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
129 | // create new string |
272
2def28b65328
adds integer overflow checks to sstrlen and sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
270
diff
changeset
|
130 | str.ptr = (char*) almalloc(a, slen + 1); |
2def28b65328
adds integer overflow checks to sstrlen and sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
270
diff
changeset
|
131 | str.length = slen; |
180
2185f19dcc45
added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
132 | if(!str.ptr) { |
2185f19dcc45
added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
133 | free(strings); |
2185f19dcc45
added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
134 | str.length = 0; |
2185f19dcc45
added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
135 | return str; |
2185f19dcc45
added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
136 | } |
2185f19dcc45
added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
137 | |
2185f19dcc45
added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
138 | // concatenate strings |
2185f19dcc45
added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
139 | size_t pos = 0; |
2185f19dcc45
added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
140 | for (size_t i=0;i<count;i++) { |
288
6af5798342e8
makes sstrcat and sstrnlen scstr_t compatible
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
276
diff
changeset
|
141 | scstr_t s = strings[i]; |
180
2185f19dcc45
added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
142 | memcpy(str.ptr + pos, s.ptr, s.length); |
2185f19dcc45
added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
143 | pos += s.length; |
2185f19dcc45
added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
144 | } |
2185f19dcc45
added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
145 | |
2185f19dcc45
added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
146 | str.ptr[str.length] = '\0'; |
2185f19dcc45
added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
147 | |
2185f19dcc45
added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
148 | free(strings); |
2185f19dcc45
added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
149 | |
2185f19dcc45
added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
150 | return str; |
2185f19dcc45
added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
151 | } |
2185f19dcc45
added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
152 | |
319
0380e438a7ce
unifies naming of sstr_t related and scstr_t related functions
Mike Becker <universe@uap-core.de>
parents:
318
diff
changeset
|
153 | sstr_t scstrcat(size_t count, scstr_t s1, ...) { |
180
2185f19dcc45
added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
154 | va_list ap; |
288
6af5798342e8
makes sstrcat and sstrnlen scstr_t compatible
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
276
diff
changeset
|
155 | va_start(ap, s1); |
6af5798342e8
makes sstrcat and sstrnlen scstr_t compatible
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
276
diff
changeset
|
156 | sstr_t s = sstrvcat_a(ucx_default_allocator(), count, s1, ap); |
180
2185f19dcc45
added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
157 | va_end(ap); |
2185f19dcc45
added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
158 | return s; |
2185f19dcc45
added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
159 | } |
2185f19dcc45
added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
160 | |
319
0380e438a7ce
unifies naming of sstr_t related and scstr_t related functions
Mike Becker <universe@uap-core.de>
parents:
318
diff
changeset
|
161 | sstr_t scstrcat_a(UcxAllocator *a, size_t count, scstr_t s1, ...) { |
180
2185f19dcc45
added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
162 | va_list ap; |
288
6af5798342e8
makes sstrcat and sstrnlen scstr_t compatible
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
276
diff
changeset
|
163 | va_start(ap, s1); |
6af5798342e8
makes sstrcat and sstrnlen scstr_t compatible
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
276
diff
changeset
|
164 | sstr_t s = sstrvcat_a(a, count, s1, ap); |
180
2185f19dcc45
added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
165 | va_end(ap); |
2185f19dcc45
added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
166 | return s; |
2185f19dcc45
added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
167 | } |
2185f19dcc45
added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
168 | |
300
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
169 | static int ucx_substring( |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
170 | size_t str_length, |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
171 | size_t start, |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
172 | size_t length, |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
173 | size_t *newlen, |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
174 | size_t *newpos) |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
175 | { |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
176 | *newlen = 0; |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
177 | *newpos = 0; |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
178 | |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
179 | if(start > str_length) { |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
180 | return 0; |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
181 | } |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
182 | |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
183 | if(length > str_length - start) { |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
184 | length = str_length - start; |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
185 | } |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
186 | *newlen = length; |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
187 | *newpos = start; |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
188 | return 1; |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
189 | } |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
190 | |
68
88dbea299440
removed const from string.*
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
67
diff
changeset
|
191 | sstr_t sstrsubs(sstr_t s, size_t start) { |
20
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
192 | return sstrsubsl (s, start, s.length-start); |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
193 | } |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
194 | |
68
88dbea299440
removed const from string.*
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
67
diff
changeset
|
195 | sstr_t sstrsubsl(sstr_t s, size_t start, size_t length) { |
300
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
196 | size_t pos; |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
197 | sstr_t ret = { NULL, 0 }; |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
198 | if(ucx_substring(s.length, start, length, &ret.length, &pos)) { |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
199 | ret.ptr = s.ptr + pos; |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
200 | } |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
201 | return ret; |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
202 | } |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
203 | |
318
348fd9cb7b14
adds remaining documentation for the scstr functions
Mike Becker <universe@uap-core.de>
parents:
317
diff
changeset
|
204 | scstr_t scstrsubs(scstr_t string, size_t start) { |
348fd9cb7b14
adds remaining documentation for the scstr functions
Mike Becker <universe@uap-core.de>
parents:
317
diff
changeset
|
205 | return scstrsubsl(string, start, string.length-start); |
300
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
206 | } |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
207 | |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
208 | scstr_t scstrsubsl(scstr_t s, size_t start, size_t length) { |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
209 | size_t pos; |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
210 | scstr_t ret = { NULL, 0 }; |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
211 | if(ucx_substring(s.length, start, length, &ret.length, &pos)) { |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
212 | ret.ptr = s.ptr + pos; |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
213 | } |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
214 | return ret; |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
215 | } |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
216 | |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
217 | |
318
348fd9cb7b14
adds remaining documentation for the scstr functions
Mike Becker <universe@uap-core.de>
parents:
317
diff
changeset
|
218 | static int ucx_strchr(const char *str, size_t length, int chr, size_t *pos) { |
300
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
219 | for(size_t i=0;i<length;i++) { |
318
348fd9cb7b14
adds remaining documentation for the scstr functions
Mike Becker <universe@uap-core.de>
parents:
317
diff
changeset
|
220 | if(str[i] == chr) { |
300
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
221 | *pos = i; |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
222 | return 1; |
173
31a8682fffb7
fixed some sstring issues + added allocator macros
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
223 | } |
20
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
224 | } |
300
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
225 | return 0; |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
226 | } |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
227 | |
318
348fd9cb7b14
adds remaining documentation for the scstr functions
Mike Becker <universe@uap-core.de>
parents:
317
diff
changeset
|
228 | static int ucx_strrchr(const char *str, size_t length, int chr, size_t *pos) { |
300
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
229 | if(length > 0) { |
306 | 230 | for(size_t i=length ; i>0 ; i--) { |
318
348fd9cb7b14
adds remaining documentation for the scstr functions
Mike Becker <universe@uap-core.de>
parents:
317
diff
changeset
|
231 | if(str[i-1] == chr) { |
306 | 232 | *pos = i-1; |
300
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
233 | return 1; |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
234 | } |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
235 | } |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
236 | } |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
237 | return 0; |
20
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
238 | } |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
239 | |
108
d2b1e67b2b48
new properties parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
104
diff
changeset
|
240 | sstr_t sstrchr(sstr_t s, int c) { |
300
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
241 | size_t pos = 0; |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
242 | if(ucx_strchr(s.ptr, s.length, c, &pos)) { |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
243 | return sstrsubs(s, pos); |
108
d2b1e67b2b48
new properties parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
104
diff
changeset
|
244 | } |
300
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
245 | return sstrn(NULL, 0); |
108
d2b1e67b2b48
new properties parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
104
diff
changeset
|
246 | } |
d2b1e67b2b48
new properties parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
104
diff
changeset
|
247 | |
148 | 248 | sstr_t sstrrchr(sstr_t s, int c) { |
300
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
249 | size_t pos = 0; |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
250 | if(ucx_strrchr(s.ptr, s.length, c, &pos)) { |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
251 | return sstrsubs(s, pos); |
148 | 252 | } |
300
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
253 | return sstrn(NULL, 0); |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
254 | } |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
255 | |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
256 | scstr_t scstrchr(scstr_t s, int c) { |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
257 | size_t pos = 0; |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
258 | if(ucx_strchr(s.ptr, s.length, c, &pos)) { |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
259 | return scstrsubs(s, pos); |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
260 | } |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
261 | return scstrn(NULL, 0); |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
262 | } |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
263 | |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
264 | scstr_t scstrrchr(scstr_t s, int c) { |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
265 | size_t pos = 0; |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
266 | if(ucx_strrchr(s.ptr, s.length, c, &pos)) { |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
267 | return scstrsubs(s, pos); |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
268 | } |
d1f814633049
completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
269 | return scstrn(NULL, 0); |
148 | 270 | } |
271 | ||
237
5ba9de6361ff
further performance tweaks to sstrstr() function
Mike Becker <universe@uap-core.de>
parents:
236
diff
changeset
|
272 | #define ptable_r(dest, useheap, ptable, index) (dest = useheap ? \ |
5ba9de6361ff
further performance tweaks to sstrstr() function
Mike Becker <universe@uap-core.de>
parents:
236
diff
changeset
|
273 | ((size_t*)ptable)[index] : (size_t) ((uint8_t*)ptable)[index]) |
236
ffc6d0910342
improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents:
235
diff
changeset
|
274 | |
237
5ba9de6361ff
further performance tweaks to sstrstr() function
Mike Becker <universe@uap-core.de>
parents:
236
diff
changeset
|
275 | #define ptable_w(useheap, ptable, index, src) do {\ |
5ba9de6361ff
further performance tweaks to sstrstr() function
Mike Becker <universe@uap-core.de>
parents:
236
diff
changeset
|
276 | if (!useheap) ((uint8_t*)ptable)[index] = (uint8_t) src;\ |
5ba9de6361ff
further performance tweaks to sstrstr() function
Mike Becker <universe@uap-core.de>
parents:
236
diff
changeset
|
277 | else ((size_t*)ptable)[index] = src;\ |
5ba9de6361ff
further performance tweaks to sstrstr() function
Mike Becker <universe@uap-core.de>
parents:
236
diff
changeset
|
278 | } while (0); |
236
ffc6d0910342
improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents:
235
diff
changeset
|
279 | |
276
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
280 | |
318
348fd9cb7b14
adds remaining documentation for the scstr functions
Mike Becker <universe@uap-core.de>
parents:
317
diff
changeset
|
281 | static const char* ucx_strstr( |
276
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
282 | const char *str, |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
283 | size_t length, |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
284 | const char *match, |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
285 | size_t matchlen, |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
286 | size_t *newlen) |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
287 | { |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
288 | *newlen = length; |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
289 | if (matchlen == 0) { |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
290 | return str; |
214
2bc19726c340
added sstrstr() function + improved sstrsplit variants by using sstrprefix()
Mike Becker <universe@uap-core.de>
parents:
213
diff
changeset
|
291 | } |
2bc19726c340
added sstrstr() function + improved sstrsplit variants by using sstrprefix()
Mike Becker <universe@uap-core.de>
parents:
213
diff
changeset
|
292 | |
276
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
293 | const char *result = NULL; |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
294 | size_t resultlen = 0; |
236
ffc6d0910342
improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents:
235
diff
changeset
|
295 | |
ffc6d0910342
improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents:
235
diff
changeset
|
296 | /* |
ffc6d0910342
improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents:
235
diff
changeset
|
297 | * IMPORTANT: |
ffc6d0910342
improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents:
235
diff
changeset
|
298 | * our prefix table contains the prefix length PLUS ONE |
ffc6d0910342
improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents:
235
diff
changeset
|
299 | * this is our decision, because we want to use the full range of size_t |
ffc6d0910342
improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents:
235
diff
changeset
|
300 | * the original algorithm needs a (-1) at one single place |
ffc6d0910342
improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents:
235
diff
changeset
|
301 | * and we want to avoid that |
ffc6d0910342
improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents:
235
diff
changeset
|
302 | */ |
ffc6d0910342
improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents:
235
diff
changeset
|
303 | |
ffc6d0910342
improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents:
235
diff
changeset
|
304 | /* static prefix table */ |
ffc6d0910342
improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents:
235
diff
changeset
|
305 | static uint8_t s_prefix_table[256]; |
ffc6d0910342
improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents:
235
diff
changeset
|
306 | |
ffc6d0910342
improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents:
235
diff
changeset
|
307 | /* check pattern length and use appropriate prefix table */ |
237
5ba9de6361ff
further performance tweaks to sstrstr() function
Mike Becker <universe@uap-core.de>
parents:
236
diff
changeset
|
308 | /* if the pattern exceeds static prefix table, allocate on the heap */ |
276
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
309 | register int useheap = matchlen > 255; |
237
5ba9de6361ff
further performance tweaks to sstrstr() function
Mike Becker <universe@uap-core.de>
parents:
236
diff
changeset
|
310 | register void* ptable = useheap ? |
276
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
311 | calloc(matchlen+1, sizeof(size_t)): s_prefix_table; |
236
ffc6d0910342
improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents:
235
diff
changeset
|
312 | |
ffc6d0910342
improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents:
235
diff
changeset
|
313 | /* keep counter in registers */ |
ffc6d0910342
improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents:
235
diff
changeset
|
314 | register size_t i, j; |
ffc6d0910342
improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents:
235
diff
changeset
|
315 | |
ffc6d0910342
improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents:
235
diff
changeset
|
316 | /* fill prefix table */ |
ffc6d0910342
improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents:
235
diff
changeset
|
317 | i = 0; j = 0; |
237
5ba9de6361ff
further performance tweaks to sstrstr() function
Mike Becker <universe@uap-core.de>
parents:
236
diff
changeset
|
318 | ptable_w(useheap, ptable, i, j); |
276
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
319 | while (i < matchlen) { |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
320 | while (j >= 1 && match[j-1] != match[i]) { |
238
27b31c2c959c
fixes major bug in construction of KMP prefix table for strstr()
Mike Becker <universe@uap-core.de>
parents:
237
diff
changeset
|
321 | ptable_r(j, useheap, ptable, j-1); |
236
ffc6d0910342
improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents:
235
diff
changeset
|
322 | } |
ffc6d0910342
improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents:
235
diff
changeset
|
323 | i++; j++; |
237
5ba9de6361ff
further performance tweaks to sstrstr() function
Mike Becker <universe@uap-core.de>
parents:
236
diff
changeset
|
324 | ptable_w(useheap, ptable, i, j); |
236
ffc6d0910342
improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents:
235
diff
changeset
|
325 | } |
ffc6d0910342
improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents:
235
diff
changeset
|
326 | |
ffc6d0910342
improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents:
235
diff
changeset
|
327 | /* search */ |
ffc6d0910342
improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents:
235
diff
changeset
|
328 | i = 0; j = 1; |
276
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
329 | while (i < length) { |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
330 | while (j >= 1 && str[i] != match[j-1]) { |
237
5ba9de6361ff
further performance tweaks to sstrstr() function
Mike Becker <universe@uap-core.de>
parents:
236
diff
changeset
|
331 | ptable_r(j, useheap, ptable, j-1); |
236
ffc6d0910342
improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents:
235
diff
changeset
|
332 | } |
ffc6d0910342
improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents:
235
diff
changeset
|
333 | i++; j++; |
276
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
334 | if (j-1 == matchlen) { |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
335 | size_t start = i - matchlen; |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
336 | result = str + start; |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
337 | resultlen = length - start; |
236
ffc6d0910342
improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents:
235
diff
changeset
|
338 | break; |
214
2bc19726c340
added sstrstr() function + improved sstrsplit variants by using sstrprefix()
Mike Becker <universe@uap-core.de>
parents:
213
diff
changeset
|
339 | } |
2bc19726c340
added sstrstr() function + improved sstrsplit variants by using sstrprefix()
Mike Becker <universe@uap-core.de>
parents:
213
diff
changeset
|
340 | } |
236
ffc6d0910342
improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents:
235
diff
changeset
|
341 | |
ffc6d0910342
improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents:
235
diff
changeset
|
342 | /* if prefix table was allocated on the heap, free it */ |
ffc6d0910342
improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents:
235
diff
changeset
|
343 | if (ptable != s_prefix_table) { |
ffc6d0910342
improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents:
235
diff
changeset
|
344 | free(ptable); |
ffc6d0910342
improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents:
235
diff
changeset
|
345 | } |
214
2bc19726c340
added sstrstr() function + improved sstrsplit variants by using sstrprefix()
Mike Becker <universe@uap-core.de>
parents:
213
diff
changeset
|
346 | |
276
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
347 | *newlen = resultlen; |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
348 | return result; |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
349 | } |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
350 | |
319
0380e438a7ce
unifies naming of sstr_t related and scstr_t related functions
Mike Becker <universe@uap-core.de>
parents:
318
diff
changeset
|
351 | sstr_t scstrsstr(sstr_t string, scstr_t match) { |
276
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
352 | sstr_t result; |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
353 | |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
354 | size_t reslen; |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
355 | const char *resstr = ucx_strstr(string.ptr, string.length, match.ptr, match.length, &reslen); |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
356 | if(!resstr) { |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
357 | result.ptr = NULL; |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
358 | result.length = 0; |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
359 | return result; |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
360 | } |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
361 | |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
362 | size_t pos = resstr - string.ptr; |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
363 | result.ptr = string.ptr + pos; |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
364 | result.length = reslen; |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
365 | |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
366 | return result; |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
367 | } |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
368 | |
319
0380e438a7ce
unifies naming of sstr_t related and scstr_t related functions
Mike Becker <universe@uap-core.de>
parents:
318
diff
changeset
|
369 | scstr_t scstrscstr(scstr_t string, scstr_t match) { |
276
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
370 | scstr_t result; |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
371 | |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
372 | size_t reslen; |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
373 | const char *resstr = ucx_strstr(string.ptr, string.length, match.ptr, match.length, &reslen); |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
374 | if(!resstr) { |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
375 | result.ptr = NULL; |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
376 | result.length = 0; |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
377 | return result; |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
378 | } |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
379 | |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
380 | size_t pos = resstr - string.ptr; |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
381 | result.ptr = string.ptr + pos; |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
382 | result.length = reslen; |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
383 | |
236
ffc6d0910342
improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents:
235
diff
changeset
|
384 | return result; |
214
2bc19726c340
added sstrstr() function + improved sstrsplit variants by using sstrprefix()
Mike Becker <universe@uap-core.de>
parents:
213
diff
changeset
|
385 | } |
2bc19726c340
added sstrstr() function + improved sstrsplit variants by using sstrprefix()
Mike Becker <universe@uap-core.de>
parents:
213
diff
changeset
|
386 | |
237
5ba9de6361ff
further performance tweaks to sstrstr() function
Mike Becker <universe@uap-core.de>
parents:
236
diff
changeset
|
387 | #undef ptable_r |
5ba9de6361ff
further performance tweaks to sstrstr() function
Mike Becker <universe@uap-core.de>
parents:
236
diff
changeset
|
388 | #undef ptable_w |
5ba9de6361ff
further performance tweaks to sstrstr() function
Mike Becker <universe@uap-core.de>
parents:
236
diff
changeset
|
389 | |
319
0380e438a7ce
unifies naming of sstr_t related and scstr_t related functions
Mike Becker <universe@uap-core.de>
parents:
318
diff
changeset
|
390 | sstr_t* scstrsplit(scstr_t s, scstr_t d, ssize_t *n) { |
0380e438a7ce
unifies naming of sstr_t related and scstr_t related functions
Mike Becker <universe@uap-core.de>
parents:
318
diff
changeset
|
391 | return scstrsplit_a(ucx_default_allocator(), s, d, n); |
119
baa839a7633f
completed documentation on sstr_t + sstrsplit overhaul + allocator version of sstrsplit
Mike Becker <universe@uap-core.de>
parents:
116
diff
changeset
|
392 | } |
baa839a7633f
completed documentation on sstr_t + sstrsplit overhaul + allocator version of sstrsplit
Mike Becker <universe@uap-core.de>
parents:
116
diff
changeset
|
393 | |
319
0380e438a7ce
unifies naming of sstr_t related and scstr_t related functions
Mike Becker <universe@uap-core.de>
parents:
318
diff
changeset
|
394 | sstr_t* scstrsplit_a(UcxAllocator *allocator, scstr_t s, scstr_t d, ssize_t *n) { |
119
baa839a7633f
completed documentation on sstr_t + sstrsplit overhaul + allocator version of sstrsplit
Mike Becker <universe@uap-core.de>
parents:
116
diff
changeset
|
395 | if (s.length == 0 || d.length == 0) { |
baa839a7633f
completed documentation on sstr_t + sstrsplit overhaul + allocator version of sstrsplit
Mike Becker <universe@uap-core.de>
parents:
116
diff
changeset
|
396 | *n = -1; |
39 | 397 | return NULL; |
398 | } | |
231
35490eb48214
improves handling of special cases delimiter size >= string size in sstrsplit
Mike Becker <universe@uap-core.de>
parents:
225
diff
changeset
|
399 | |
35490eb48214
improves handling of special cases delimiter size >= string size in sstrsplit
Mike Becker <universe@uap-core.de>
parents:
225
diff
changeset
|
400 | /* special cases: delimiter is at least as large as the string */ |
35490eb48214
improves handling of special cases delimiter size >= string size in sstrsplit
Mike Becker <universe@uap-core.de>
parents:
225
diff
changeset
|
401 | if (d.length >= s.length) { |
35490eb48214
improves handling of special cases delimiter size >= string size in sstrsplit
Mike Becker <universe@uap-core.de>
parents:
225
diff
changeset
|
402 | /* exact match */ |
35490eb48214
improves handling of special cases delimiter size >= string size in sstrsplit
Mike Becker <universe@uap-core.de>
parents:
225
diff
changeset
|
403 | if (sstrcmp(s, d) == 0) { |
35490eb48214
improves handling of special cases delimiter size >= string size in sstrsplit
Mike Becker <universe@uap-core.de>
parents:
225
diff
changeset
|
404 | *n = 0; |
35490eb48214
improves handling of special cases delimiter size >= string size in sstrsplit
Mike Becker <universe@uap-core.de>
parents:
225
diff
changeset
|
405 | return NULL; |
35490eb48214
improves handling of special cases delimiter size >= string size in sstrsplit
Mike Becker <universe@uap-core.de>
parents:
225
diff
changeset
|
406 | } else /* no match possible */ { |
35490eb48214
improves handling of special cases delimiter size >= string size in sstrsplit
Mike Becker <universe@uap-core.de>
parents:
225
diff
changeset
|
407 | *n = 1; |
35490eb48214
improves handling of special cases delimiter size >= string size in sstrsplit
Mike Becker <universe@uap-core.de>
parents:
225
diff
changeset
|
408 | sstr_t *result = (sstr_t*) almalloc(allocator, sizeof(sstr_t)); |
270
3d80d425543b
adds integer overflow checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
259
diff
changeset
|
409 | if(result) { |
3d80d425543b
adds integer overflow checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
259
diff
changeset
|
410 | *result = sstrdup_a(allocator, s); |
3d80d425543b
adds integer overflow checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
259
diff
changeset
|
411 | } else { |
3d80d425543b
adds integer overflow checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
259
diff
changeset
|
412 | *n = -2; |
3d80d425543b
adds integer overflow checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
259
diff
changeset
|
413 | } |
231
35490eb48214
improves handling of special cases delimiter size >= string size in sstrsplit
Mike Becker <universe@uap-core.de>
parents:
225
diff
changeset
|
414 | return result; |
35490eb48214
improves handling of special cases delimiter size >= string size in sstrsplit
Mike Becker <universe@uap-core.de>
parents:
225
diff
changeset
|
415 | } |
35490eb48214
improves handling of special cases delimiter size >= string size in sstrsplit
Mike Becker <universe@uap-core.de>
parents:
225
diff
changeset
|
416 | } |
35490eb48214
improves handling of special cases delimiter size >= string size in sstrsplit
Mike Becker <universe@uap-core.de>
parents:
225
diff
changeset
|
417 | |
173
31a8682fffb7
fixed some sstring issues + added allocator macros
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
418 | ssize_t nmax = *n; |
235
7cf1e41833a2
reduces amount of realloc calls in sstrsplit
Mike Becker <universe@uap-core.de>
parents:
234
diff
changeset
|
419 | size_t arrlen = 16; |
270
3d80d425543b
adds integer overflow checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
259
diff
changeset
|
420 | sstr_t* result = (sstr_t*) alcalloc(allocator, arrlen, sizeof(sstr_t)); |
39 | 421 | |
119
baa839a7633f
completed documentation on sstr_t + sstrsplit overhaul + allocator version of sstrsplit
Mike Becker <universe@uap-core.de>
parents:
116
diff
changeset
|
422 | if (result) { |
276
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
423 | scstr_t curpos = s; |
233
bd58fdde142d
reimplementation of sstrsplit
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
424 | ssize_t j = 1; |
bd58fdde142d
reimplementation of sstrsplit
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
425 | while (1) { |
276
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
426 | scstr_t match; |
234
7a63b4986b5b
adds an optimization for one-byte delimiters to sstrsplit (will take effect after planned reimplementation of sstrstr)
Mike Becker <universe@uap-core.de>
parents:
233
diff
changeset
|
427 | /* optimize for one byte delimiters */ |
7a63b4986b5b
adds an optimization for one-byte delimiters to sstrsplit (will take effect after planned reimplementation of sstrstr)
Mike Becker <universe@uap-core.de>
parents:
233
diff
changeset
|
428 | if (d.length == 1) { |
7a63b4986b5b
adds an optimization for one-byte delimiters to sstrsplit (will take effect after planned reimplementation of sstrstr)
Mike Becker <universe@uap-core.de>
parents:
233
diff
changeset
|
429 | match = curpos; |
7a63b4986b5b
adds an optimization for one-byte delimiters to sstrsplit (will take effect after planned reimplementation of sstrstr)
Mike Becker <universe@uap-core.de>
parents:
233
diff
changeset
|
430 | for (size_t i = 0 ; i < curpos.length ; i++) { |
7a63b4986b5b
adds an optimization for one-byte delimiters to sstrsplit (will take effect after planned reimplementation of sstrstr)
Mike Becker <universe@uap-core.de>
parents:
233
diff
changeset
|
431 | if (curpos.ptr[i] == *(d.ptr)) { |
7a63b4986b5b
adds an optimization for one-byte delimiters to sstrsplit (will take effect after planned reimplementation of sstrstr)
Mike Becker <universe@uap-core.de>
parents:
233
diff
changeset
|
432 | match.ptr = curpos.ptr + i; |
7a63b4986b5b
adds an optimization for one-byte delimiters to sstrsplit (will take effect after planned reimplementation of sstrstr)
Mike Becker <universe@uap-core.de>
parents:
233
diff
changeset
|
433 | break; |
7a63b4986b5b
adds an optimization for one-byte delimiters to sstrsplit (will take effect after planned reimplementation of sstrstr)
Mike Becker <universe@uap-core.de>
parents:
233
diff
changeset
|
434 | } |
7a63b4986b5b
adds an optimization for one-byte delimiters to sstrsplit (will take effect after planned reimplementation of sstrstr)
Mike Becker <universe@uap-core.de>
parents:
233
diff
changeset
|
435 | match.length--; |
7a63b4986b5b
adds an optimization for one-byte delimiters to sstrsplit (will take effect after planned reimplementation of sstrstr)
Mike Becker <universe@uap-core.de>
parents:
233
diff
changeset
|
436 | } |
7a63b4986b5b
adds an optimization for one-byte delimiters to sstrsplit (will take effect after planned reimplementation of sstrstr)
Mike Becker <universe@uap-core.de>
parents:
233
diff
changeset
|
437 | } else { |
319
0380e438a7ce
unifies naming of sstr_t related and scstr_t related functions
Mike Becker <universe@uap-core.de>
parents:
318
diff
changeset
|
438 | match = scstrscstr(curpos, d); |
234
7a63b4986b5b
adds an optimization for one-byte delimiters to sstrsplit (will take effect after planned reimplementation of sstrstr)
Mike Becker <universe@uap-core.de>
parents:
233
diff
changeset
|
439 | } |
233
bd58fdde142d
reimplementation of sstrsplit
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
440 | if (match.length > 0) { |
bd58fdde142d
reimplementation of sstrsplit
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
441 | /* is this our last try? */ |
bd58fdde142d
reimplementation of sstrsplit
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
442 | if (nmax == 0 || j < nmax) { |
bd58fdde142d
reimplementation of sstrsplit
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
443 | /* copy the current string to the array */ |
276
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
444 | scstr_t item = scstrn(curpos.ptr, match.ptr - curpos.ptr); |
233
bd58fdde142d
reimplementation of sstrsplit
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
445 | result[j-1] = sstrdup_a(allocator, item); |
bd58fdde142d
reimplementation of sstrsplit
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
446 | size_t processed = item.length + d.length; |
bd58fdde142d
reimplementation of sstrsplit
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
447 | curpos.ptr += processed; |
bd58fdde142d
reimplementation of sstrsplit
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
448 | curpos.length -= processed; |
39 | 449 | |
233
bd58fdde142d
reimplementation of sstrsplit
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
450 | /* allocate memory for the next string */ |
bd58fdde142d
reimplementation of sstrsplit
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
451 | j++; |
235
7cf1e41833a2
reduces amount of realloc calls in sstrsplit
Mike Becker <universe@uap-core.de>
parents:
234
diff
changeset
|
452 | if (j > arrlen) { |
7cf1e41833a2
reduces amount of realloc calls in sstrsplit
Mike Becker <universe@uap-core.de>
parents:
234
diff
changeset
|
453 | arrlen *= 2; |
270
3d80d425543b
adds integer overflow checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
259
diff
changeset
|
454 | size_t reallocsz; |
3d80d425543b
adds integer overflow checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
259
diff
changeset
|
455 | sstr_t* reallocated = NULL; |
3d80d425543b
adds integer overflow checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
259
diff
changeset
|
456 | if(!ucx_szmul(arrlen, sizeof(sstr_t), &reallocsz)) { |
3d80d425543b
adds integer overflow checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
259
diff
changeset
|
457 | reallocated = (sstr_t*) alrealloc( |
3d80d425543b
adds integer overflow checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
259
diff
changeset
|
458 | allocator, result, reallocsz); |
3d80d425543b
adds integer overflow checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
259
diff
changeset
|
459 | } |
235
7cf1e41833a2
reduces amount of realloc calls in sstrsplit
Mike Becker <universe@uap-core.de>
parents:
234
diff
changeset
|
460 | if (reallocated) { |
7cf1e41833a2
reduces amount of realloc calls in sstrsplit
Mike Becker <universe@uap-core.de>
parents:
234
diff
changeset
|
461 | result = reallocated; |
7cf1e41833a2
reduces amount of realloc calls in sstrsplit
Mike Becker <universe@uap-core.de>
parents:
234
diff
changeset
|
462 | } else { |
7cf1e41833a2
reduces amount of realloc calls in sstrsplit
Mike Becker <universe@uap-core.de>
parents:
234
diff
changeset
|
463 | for (ssize_t i = 0 ; i < j-1 ; i++) { |
7cf1e41833a2
reduces amount of realloc calls in sstrsplit
Mike Becker <universe@uap-core.de>
parents:
234
diff
changeset
|
464 | alfree(allocator, result[i].ptr); |
7cf1e41833a2
reduces amount of realloc calls in sstrsplit
Mike Becker <universe@uap-core.de>
parents:
234
diff
changeset
|
465 | } |
7cf1e41833a2
reduces amount of realloc calls in sstrsplit
Mike Becker <universe@uap-core.de>
parents:
234
diff
changeset
|
466 | alfree(allocator, result); |
7cf1e41833a2
reduces amount of realloc calls in sstrsplit
Mike Becker <universe@uap-core.de>
parents:
234
diff
changeset
|
467 | *n = -2; |
7cf1e41833a2
reduces amount of realloc calls in sstrsplit
Mike Becker <universe@uap-core.de>
parents:
234
diff
changeset
|
468 | return NULL; |
233
bd58fdde142d
reimplementation of sstrsplit
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
469 | } |
bd58fdde142d
reimplementation of sstrsplit
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
470 | } |
bd58fdde142d
reimplementation of sstrsplit
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
471 | } else { |
bd58fdde142d
reimplementation of sstrsplit
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
472 | /* nmax reached, copy the _full_ remaining string */ |
bd58fdde142d
reimplementation of sstrsplit
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
473 | result[j-1] = sstrdup_a(allocator, curpos); |
bd58fdde142d
reimplementation of sstrsplit
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
474 | break; |
bd58fdde142d
reimplementation of sstrsplit
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
475 | } |
173
31a8682fffb7
fixed some sstring issues + added allocator macros
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
476 | } else { |
233
bd58fdde142d
reimplementation of sstrsplit
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
477 | /* no more matches, copy last string */ |
bd58fdde142d
reimplementation of sstrsplit
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
478 | result[j-1] = sstrdup_a(allocator, curpos); |
173
31a8682fffb7
fixed some sstring issues + added allocator macros
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
479 | break; |
31a8682fffb7
fixed some sstring issues + added allocator macros
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
480 | } |
119
baa839a7633f
completed documentation on sstr_t + sstrsplit overhaul + allocator version of sstrsplit
Mike Becker <universe@uap-core.de>
parents:
116
diff
changeset
|
481 | } |
233
bd58fdde142d
reimplementation of sstrsplit
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
482 | *n = j; |
119
baa839a7633f
completed documentation on sstr_t + sstrsplit overhaul + allocator version of sstrsplit
Mike Becker <universe@uap-core.de>
parents:
116
diff
changeset
|
483 | } else { |
baa839a7633f
completed documentation on sstr_t + sstrsplit overhaul + allocator version of sstrsplit
Mike Becker <universe@uap-core.de>
parents:
116
diff
changeset
|
484 | *n = -2; |
39 | 485 | } |
486 | ||
487 | return result; | |
488 | } | |
489 | ||
319
0380e438a7ce
unifies naming of sstr_t related and scstr_t related functions
Mike Becker <universe@uap-core.de>
parents:
318
diff
changeset
|
490 | int scstrcmp(scstr_t s1, scstr_t s2) { |
116
234920008754
some fixes and some documentation
Mike Becker <universe@uap-core.de>
parents:
109
diff
changeset
|
491 | if (s1.length == s2.length) { |
234920008754
some fixes and some documentation
Mike Becker <universe@uap-core.de>
parents:
109
diff
changeset
|
492 | return memcmp(s1.ptr, s2.ptr, s1.length); |
234920008754
some fixes and some documentation
Mike Becker <universe@uap-core.de>
parents:
109
diff
changeset
|
493 | } else if (s1.length > s2.length) { |
234920008754
some fixes and some documentation
Mike Becker <universe@uap-core.de>
parents:
109
diff
changeset
|
494 | return 1; |
234920008754
some fixes and some documentation
Mike Becker <universe@uap-core.de>
parents:
109
diff
changeset
|
495 | } else { |
234920008754
some fixes and some documentation
Mike Becker <universe@uap-core.de>
parents:
109
diff
changeset
|
496 | return -1; |
234920008754
some fixes and some documentation
Mike Becker <universe@uap-core.de>
parents:
109
diff
changeset
|
497 | } |
20
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
498 | } |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
499 | |
319
0380e438a7ce
unifies naming of sstr_t related and scstr_t related functions
Mike Becker <universe@uap-core.de>
parents:
318
diff
changeset
|
500 | int scstrcasecmp(scstr_t s1, scstr_t s2) { |
149 | 501 | if (s1.length == s2.length) { |
502 | #ifdef _WIN32 | |
503 | return _strnicmp(s1.ptr, s2.ptr, s1.length); | |
504 | #else | |
505 | return strncasecmp(s1.ptr, s2.ptr, s1.length); | |
506 | #endif | |
507 | } else if (s1.length > s2.length) { | |
508 | return 1; | |
509 | } else { | |
510 | return -1; | |
511 | } | |
512 | } | |
513 | ||
319
0380e438a7ce
unifies naming of sstr_t related and scstr_t related functions
Mike Becker <universe@uap-core.de>
parents:
318
diff
changeset
|
514 | sstr_t scstrdup(scstr_t s) { |
125
fca8efb122de
changed suffix for allocator aware functions + added allocator aware functions for UcxList
Mike Becker <universe@uap-core.de>
parents:
123
diff
changeset
|
515 | return sstrdup_a(ucx_default_allocator(), s); |
109
75cb6590358b
added properties load/store functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
108
diff
changeset
|
516 | } |
20
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
517 | |
319
0380e438a7ce
unifies naming of sstr_t related and scstr_t related functions
Mike Becker <universe@uap-core.de>
parents:
318
diff
changeset
|
518 | sstr_t scstrdup_a(UcxAllocator *allocator, scstr_t s) { |
109
75cb6590358b
added properties load/store functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
108
diff
changeset
|
519 | sstr_t newstring; |
173
31a8682fffb7
fixed some sstring issues + added allocator macros
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
520 | newstring.ptr = (char*)almalloc(allocator, s.length + 1); |
109
75cb6590358b
added properties load/store functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
108
diff
changeset
|
521 | if (newstring.ptr) { |
75cb6590358b
added properties load/store functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
108
diff
changeset
|
522 | newstring.length = s.length; |
75cb6590358b
added properties load/store functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
108
diff
changeset
|
523 | newstring.ptr[newstring.length] = 0; |
75cb6590358b
added properties load/store functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
108
diff
changeset
|
524 | |
75cb6590358b
added properties load/store functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
108
diff
changeset
|
525 | memcpy(newstring.ptr, s.ptr, s.length); |
75cb6590358b
added properties load/store functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
108
diff
changeset
|
526 | } else { |
75cb6590358b
added properties load/store functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
108
diff
changeset
|
527 | newstring.length = 0; |
75cb6590358b
added properties load/store functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
108
diff
changeset
|
528 | } |
75cb6590358b
added properties load/store functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
108
diff
changeset
|
529 | |
20
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
530 | return newstring; |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
531 | } |
96 | 532 | |
276
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
533 | |
318
348fd9cb7b14
adds remaining documentation for the scstr functions
Mike Becker <universe@uap-core.de>
parents:
317
diff
changeset
|
534 | static size_t ucx_strtrim(const char *s, size_t len, size_t *newlen) { |
276
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
535 | const char *newptr = s; |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
536 | size_t length = len; |
98
0a752853f792
fixed sstrtrim for empty strings
Mike Becker <universe@uap-core.de>
parents:
97
diff
changeset
|
537 | |
276
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
538 | while(length > 0 && isspace(*newptr)) { |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
539 | newptr++; |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
540 | length--; |
96 | 541 | } |
276
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
542 | while(length > 0 && isspace(newptr[length-1])) { |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
543 | length--; |
104
9d3dea320d8e
fixed sstrtrim and some warnings
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
544 | } |
9d3dea320d8e
fixed sstrtrim and some warnings
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
545 | |
276
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
546 | *newlen = length; |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
547 | return newptr - s; |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
548 | } |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
549 | |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
550 | sstr_t sstrtrim(sstr_t string) { |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
551 | sstr_t newstr; |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
552 | newstr.ptr = string.ptr |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
553 | + ucx_strtrim(string.ptr, string.length, &newstr.length); |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
554 | return newstr; |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
555 | } |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
556 | |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
557 | scstr_t scstrtrim(scstr_t string) { |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
558 | scstr_t newstr; |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
559 | newstr.ptr = string.ptr |
f1b2146d4805
adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
275
diff
changeset
|
560 | + ucx_strtrim(string.ptr, string.length, &newstr.length); |
96 | 561 | return newstr; |
562 | } | |
146
aa376dba1ba8
fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents:
125
diff
changeset
|
563 | |
319
0380e438a7ce
unifies naming of sstr_t related and scstr_t related functions
Mike Becker <universe@uap-core.de>
parents:
318
diff
changeset
|
564 | int scstrprefix(scstr_t string, scstr_t prefix) { |
146
aa376dba1ba8
fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents:
125
diff
changeset
|
565 | if (string.length == 0) { |
aa376dba1ba8
fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents:
125
diff
changeset
|
566 | return prefix.length == 0; |
aa376dba1ba8
fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents:
125
diff
changeset
|
567 | } |
aa376dba1ba8
fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents:
125
diff
changeset
|
568 | if (prefix.length == 0) { |
aa376dba1ba8
fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents:
125
diff
changeset
|
569 | return 1; |
aa376dba1ba8
fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents:
125
diff
changeset
|
570 | } |
aa376dba1ba8
fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents:
125
diff
changeset
|
571 | |
aa376dba1ba8
fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents:
125
diff
changeset
|
572 | if (prefix.length > string.length) { |
aa376dba1ba8
fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents:
125
diff
changeset
|
573 | return 0; |
aa376dba1ba8
fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents:
125
diff
changeset
|
574 | } else { |
aa376dba1ba8
fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents:
125
diff
changeset
|
575 | return memcmp(string.ptr, prefix.ptr, prefix.length) == 0; |
aa376dba1ba8
fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents:
125
diff
changeset
|
576 | } |
aa376dba1ba8
fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents:
125
diff
changeset
|
577 | } |
aa376dba1ba8
fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents:
125
diff
changeset
|
578 | |
319
0380e438a7ce
unifies naming of sstr_t related and scstr_t related functions
Mike Becker <universe@uap-core.de>
parents:
318
diff
changeset
|
579 | int scstrsuffix(scstr_t string, scstr_t suffix) { |
146
aa376dba1ba8
fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents:
125
diff
changeset
|
580 | if (string.length == 0) { |
aa376dba1ba8
fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents:
125
diff
changeset
|
581 | return suffix.length == 0; |
aa376dba1ba8
fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents:
125
diff
changeset
|
582 | } |
aa376dba1ba8
fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents:
125
diff
changeset
|
583 | if (suffix.length == 0) { |
aa376dba1ba8
fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents:
125
diff
changeset
|
584 | return 1; |
aa376dba1ba8
fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents:
125
diff
changeset
|
585 | } |
aa376dba1ba8
fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents:
125
diff
changeset
|
586 | |
aa376dba1ba8
fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents:
125
diff
changeset
|
587 | if (suffix.length > string.length) { |
aa376dba1ba8
fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents:
125
diff
changeset
|
588 | return 0; |
aa376dba1ba8
fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents:
125
diff
changeset
|
589 | } else { |
aa376dba1ba8
fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents:
125
diff
changeset
|
590 | return memcmp(string.ptr+string.length-suffix.length, |
aa376dba1ba8
fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents:
125
diff
changeset
|
591 | suffix.ptr, suffix.length) == 0; |
aa376dba1ba8
fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents:
125
diff
changeset
|
592 | } |
aa376dba1ba8
fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents:
125
diff
changeset
|
593 | } |
210
6bdb04d87236
added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents:
192
diff
changeset
|
594 | |
319
0380e438a7ce
unifies naming of sstr_t related and scstr_t related functions
Mike Becker <universe@uap-core.de>
parents:
318
diff
changeset
|
595 | sstr_t scstrlower(scstr_t string) { |
210
6bdb04d87236
added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents:
192
diff
changeset
|
596 | sstr_t ret = sstrdup(string); |
6bdb04d87236
added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents:
192
diff
changeset
|
597 | for (size_t i = 0; i < ret.length ; i++) { |
6bdb04d87236
added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents:
192
diff
changeset
|
598 | ret.ptr[i] = tolower(ret.ptr[i]); |
6bdb04d87236
added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents:
192
diff
changeset
|
599 | } |
6bdb04d87236
added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents:
192
diff
changeset
|
600 | return ret; |
6bdb04d87236
added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents:
192
diff
changeset
|
601 | } |
6bdb04d87236
added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents:
192
diff
changeset
|
602 | |
319
0380e438a7ce
unifies naming of sstr_t related and scstr_t related functions
Mike Becker <universe@uap-core.de>
parents:
318
diff
changeset
|
603 | sstr_t scstrlower_a(UcxAllocator *allocator, scstr_t string) { |
210
6bdb04d87236
added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents:
192
diff
changeset
|
604 | sstr_t ret = sstrdup_a(allocator, string); |
6bdb04d87236
added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents:
192
diff
changeset
|
605 | for (size_t i = 0; i < ret.length ; i++) { |
6bdb04d87236
added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents:
192
diff
changeset
|
606 | ret.ptr[i] = tolower(ret.ptr[i]); |
6bdb04d87236
added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents:
192
diff
changeset
|
607 | } |
6bdb04d87236
added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents:
192
diff
changeset
|
608 | return ret; |
6bdb04d87236
added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents:
192
diff
changeset
|
609 | } |
6bdb04d87236
added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents:
192
diff
changeset
|
610 | |
319
0380e438a7ce
unifies naming of sstr_t related and scstr_t related functions
Mike Becker <universe@uap-core.de>
parents:
318
diff
changeset
|
611 | sstr_t scstrupper(scstr_t string) { |
210
6bdb04d87236
added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents:
192
diff
changeset
|
612 | sstr_t ret = sstrdup(string); |
6bdb04d87236
added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents:
192
diff
changeset
|
613 | for (size_t i = 0; i < ret.length ; i++) { |
6bdb04d87236
added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents:
192
diff
changeset
|
614 | ret.ptr[i] = toupper(ret.ptr[i]); |
6bdb04d87236
added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents:
192
diff
changeset
|
615 | } |
6bdb04d87236
added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents:
192
diff
changeset
|
616 | return ret; |
6bdb04d87236
added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents:
192
diff
changeset
|
617 | } |
6bdb04d87236
added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents:
192
diff
changeset
|
618 | |
319
0380e438a7ce
unifies naming of sstr_t related and scstr_t related functions
Mike Becker <universe@uap-core.de>
parents:
318
diff
changeset
|
619 | sstr_t scstrupper_a(UcxAllocator *allocator, scstr_t string) { |
210
6bdb04d87236
added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents:
192
diff
changeset
|
620 | sstr_t ret = sstrdup_a(allocator, string); |
6bdb04d87236
added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents:
192
diff
changeset
|
621 | for (size_t i = 0; i < ret.length ; i++) { |
6bdb04d87236
added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents:
192
diff
changeset
|
622 | ret.ptr[i] = toupper(ret.ptr[i]); |
6bdb04d87236
added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents:
192
diff
changeset
|
623 | } |
6bdb04d87236
added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents:
192
diff
changeset
|
624 | return ret; |
6bdb04d87236
added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents:
192
diff
changeset
|
625 | } |
275
96f643d30ff1
adds scstr_t struct for const strings and adapts some string functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
272
diff
changeset
|
626 | |
316
be0f6bd10b52
adjusts documentation of UCX string types, converters, and constructors
Mike Becker <universe@uap-core.de>
parents:
315
diff
changeset
|
627 | // type adjustment functions |
be0f6bd10b52
adjusts documentation of UCX string types, converters, and constructors
Mike Becker <universe@uap-core.de>
parents:
315
diff
changeset
|
628 | scstr_t ucx_sc2sc(scstr_t str) { |
be0f6bd10b52
adjusts documentation of UCX string types, converters, and constructors
Mike Becker <universe@uap-core.de>
parents:
315
diff
changeset
|
629 | return str; |
275
96f643d30ff1
adds scstr_t struct for const strings and adapts some string functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
272
diff
changeset
|
630 | } |
96f643d30ff1
adds scstr_t struct for const strings and adapts some string functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
272
diff
changeset
|
631 | scstr_t ucx_ss2sc(sstr_t str) { |
96f643d30ff1
adds scstr_t struct for const strings and adapts some string functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
272
diff
changeset
|
632 | scstr_t cs; |
96f643d30ff1
adds scstr_t struct for const strings and adapts some string functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
272
diff
changeset
|
633 | cs.ptr = str.ptr; |
96f643d30ff1
adds scstr_t struct for const strings and adapts some string functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
272
diff
changeset
|
634 | cs.length = str.length; |
96f643d30ff1
adds scstr_t struct for const strings and adapts some string functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
272
diff
changeset
|
635 | return cs; |
96f643d30ff1
adds scstr_t struct for const strings and adapts some string functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
272
diff
changeset
|
636 | } |
96f643d30ff1
adds scstr_t struct for const strings and adapts some string functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
272
diff
changeset
|
637 | scstr_t ucx_ss2c_s(scstr_t c) { |
96f643d30ff1
adds scstr_t struct for const strings and adapts some string functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
272
diff
changeset
|
638 | return c; |
96f643d30ff1
adds scstr_t struct for const strings and adapts some string functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
272
diff
changeset
|
639 | } |