changeset
unifies naming of sstr_t related and scstr_t related functions
Wed, 16 May 2018 18:56:44 +0200
- author
- Mike Becker <universe@uap-core.de>
- date
- Wed, 16 May 2018 18:56:44 +0200
- changeset 319
- 0380e438a7ce
- parent 318
- 348fd9cb7b14
- child 320
- 0ffb71f15426
unifies naming of sstr_t related and scstr_t related functions
| src/string.c | file | annotate | diff | comparison | revisions | |
| src/ucx/string.h | file | annotate | diff | comparison | revisions |
1.1 --- a/src/string.c Wed May 16 14:02:59 2018 +0200 1.2 +++ b/src/string.c Wed May 16 18:56:44 2018 +0200 1.3 @@ -65,7 +65,7 @@ 1.4 } 1.5 1.6 1.7 -size_t ucx_strnlen(size_t n, ...) { 1.8 +size_t scstrnlen(size_t n, ...) { 1.9 va_list ap; 1.10 va_start(ap, n); 1.11 1.12 @@ -150,7 +150,7 @@ 1.13 return str; 1.14 } 1.15 1.16 -sstr_t ucx_strcat(size_t count, scstr_t s1, ...) { 1.17 +sstr_t scstrcat(size_t count, scstr_t s1, ...) { 1.18 va_list ap; 1.19 va_start(ap, s1); 1.20 sstr_t s = sstrvcat_a(ucx_default_allocator(), count, s1, ap); 1.21 @@ -158,7 +158,7 @@ 1.22 return s; 1.23 } 1.24 1.25 -sstr_t ucx_strcat_a(UcxAllocator *a, size_t count, scstr_t s1, ...) { 1.26 +sstr_t scstrcat_a(UcxAllocator *a, size_t count, scstr_t s1, ...) { 1.27 va_list ap; 1.28 va_start(ap, s1); 1.29 sstr_t s = sstrvcat_a(a, count, s1, ap); 1.30 @@ -348,7 +348,7 @@ 1.31 return result; 1.32 } 1.33 1.34 -sstr_t ucx_sstrstr(sstr_t string, scstr_t match) { 1.35 +sstr_t scstrsstr(sstr_t string, scstr_t match) { 1.36 sstr_t result; 1.37 1.38 size_t reslen; 1.39 @@ -366,7 +366,7 @@ 1.40 return result; 1.41 } 1.42 1.43 -scstr_t ucx_scstrstr(scstr_t string, scstr_t match) { 1.44 +scstr_t scstrscstr(scstr_t string, scstr_t match) { 1.45 scstr_t result; 1.46 1.47 size_t reslen; 1.48 @@ -387,11 +387,11 @@ 1.49 #undef ptable_r 1.50 #undef ptable_w 1.51 1.52 -sstr_t* ucx_strsplit(scstr_t s, scstr_t d, ssize_t *n) { 1.53 - return ucx_strsplit_a(ucx_default_allocator(), s, d, n); 1.54 +sstr_t* scstrsplit(scstr_t s, scstr_t d, ssize_t *n) { 1.55 + return scstrsplit_a(ucx_default_allocator(), s, d, n); 1.56 } 1.57 1.58 -sstr_t* ucx_strsplit_a(UcxAllocator *allocator, scstr_t s, scstr_t d, ssize_t *n) { 1.59 +sstr_t* scstrsplit_a(UcxAllocator *allocator, scstr_t s, scstr_t d, ssize_t *n) { 1.60 if (s.length == 0 || d.length == 0) { 1.61 *n = -1; 1.62 return NULL; 1.63 @@ -435,7 +435,7 @@ 1.64 match.length--; 1.65 } 1.66 } else { 1.67 - match = scstrstr(curpos, d); 1.68 + match = scstrscstr(curpos, d); 1.69 } 1.70 if (match.length > 0) { 1.71 /* is this our last try? */ 1.72 @@ -487,7 +487,7 @@ 1.73 return result; 1.74 } 1.75 1.76 -int ucx_strcmp(scstr_t s1, scstr_t s2) { 1.77 +int scstrcmp(scstr_t s1, scstr_t s2) { 1.78 if (s1.length == s2.length) { 1.79 return memcmp(s1.ptr, s2.ptr, s1.length); 1.80 } else if (s1.length > s2.length) { 1.81 @@ -497,7 +497,7 @@ 1.82 } 1.83 } 1.84 1.85 -int ucx_strcasecmp(scstr_t s1, scstr_t s2) { 1.86 +int scstrcasecmp(scstr_t s1, scstr_t s2) { 1.87 if (s1.length == s2.length) { 1.88 #ifdef _WIN32 1.89 return _strnicmp(s1.ptr, s2.ptr, s1.length); 1.90 @@ -511,11 +511,11 @@ 1.91 } 1.92 } 1.93 1.94 -sstr_t ucx_strdup(scstr_t s) { 1.95 +sstr_t scstrdup(scstr_t s) { 1.96 return sstrdup_a(ucx_default_allocator(), s); 1.97 } 1.98 1.99 -sstr_t ucx_strdup_a(UcxAllocator *allocator, scstr_t s) { 1.100 +sstr_t scstrdup_a(UcxAllocator *allocator, scstr_t s) { 1.101 sstr_t newstring; 1.102 newstring.ptr = (char*)almalloc(allocator, s.length + 1); 1.103 if (newstring.ptr) { 1.104 @@ -561,7 +561,7 @@ 1.105 return newstr; 1.106 } 1.107 1.108 -int ucx_strprefix(scstr_t string, scstr_t prefix) { 1.109 +int scstrprefix(scstr_t string, scstr_t prefix) { 1.110 if (string.length == 0) { 1.111 return prefix.length == 0; 1.112 } 1.113 @@ -576,7 +576,7 @@ 1.114 } 1.115 } 1.116 1.117 -int ucx_strsuffix(scstr_t string, scstr_t suffix) { 1.118 +int scstrsuffix(scstr_t string, scstr_t suffix) { 1.119 if (string.length == 0) { 1.120 return suffix.length == 0; 1.121 } 1.122 @@ -592,7 +592,7 @@ 1.123 } 1.124 } 1.125 1.126 -sstr_t ucx_strlower(scstr_t string) { 1.127 +sstr_t scstrlower(scstr_t string) { 1.128 sstr_t ret = sstrdup(string); 1.129 for (size_t i = 0; i < ret.length ; i++) { 1.130 ret.ptr[i] = tolower(ret.ptr[i]); 1.131 @@ -600,7 +600,7 @@ 1.132 return ret; 1.133 } 1.134 1.135 -sstr_t ucx_strlower_a(UcxAllocator *allocator, scstr_t string) { 1.136 +sstr_t scstrlower_a(UcxAllocator *allocator, scstr_t string) { 1.137 sstr_t ret = sstrdup_a(allocator, string); 1.138 for (size_t i = 0; i < ret.length ; i++) { 1.139 ret.ptr[i] = tolower(ret.ptr[i]); 1.140 @@ -608,7 +608,7 @@ 1.141 return ret; 1.142 } 1.143 1.144 -sstr_t ucx_strupper(scstr_t string) { 1.145 +sstr_t scstrupper(scstr_t string) { 1.146 sstr_t ret = sstrdup(string); 1.147 for (size_t i = 0; i < ret.length ; i++) { 1.148 ret.ptr[i] = toupper(ret.ptr[i]); 1.149 @@ -616,7 +616,7 @@ 1.150 return ret; 1.151 } 1.152 1.153 -sstr_t ucx_strupper_a(UcxAllocator *allocator, scstr_t string) { 1.154 +sstr_t scstrupper_a(UcxAllocator *allocator, scstr_t string) { 1.155 sstr_t ret = sstrdup_a(allocator, string); 1.156 for (size_t i = 0; i < ret.length ; i++) { 1.157 ret.ptr[i] = toupper(ret.ptr[i]);
2.1 --- a/src/ucx/string.h Wed May 16 14:02:59 2018 +0200 2.2 +++ b/src/ucx/string.h Wed May 16 18:56:44 2018 +0200 2.3 @@ -256,9 +256,6 @@ 2.4 /** 2.5 * Returns the cumulated length of all specified strings. 2.6 * 2.7 - * You may arbitrarily mix up mutable (<code>sstr_t</code>) and immutable 2.8 - * (<code>scstr_t</code>) strings. 2.9 - * 2.10 * <b>Attention:</b> if the count argument does not match the count of the 2.11 * specified strings, the behavior is undefined. 2.12 * 2.13 @@ -266,16 +263,16 @@ 2.14 * @param ... all strings 2.15 * @return the cumulated length of all strings 2.16 */ 2.17 -size_t ucx_strnlen(size_t count, ...); 2.18 +size_t scstrnlen(size_t count, ...); 2.19 2.20 /** 2.21 - * Alias for ucx_strnlen(). 2.22 + * Alias for scstrnlen() which automatically casts the arguments. 2.23 * 2.24 * @param count the total number of specified strings (so at least 1) 2.25 * @param ... all strings 2.26 * @return the cumulated length of all strings 2.27 */ 2.28 -#define sstrnlen(count, ...) ucx_strnlen(count, __VA_ARGS__) 2.29 +#define sstrnlen(count, ...) scstrnlen(count, __VA_ARGS__) 2.30 2.31 /** 2.32 * Concatenates two or more strings. 2.33 @@ -291,22 +288,22 @@ 2.34 * @param ... all remaining strings 2.35 * @return the concatenated string 2.36 */ 2.37 -sstr_t ucx_strcat(size_t count, scstr_t s1, ...); 2.38 +sstr_t scstrcat(size_t count, scstr_t s1, ...); 2.39 2.40 /** 2.41 - * Alias for ucx_strcat() which automatically casts the first string. 2.42 + * Alias for scstrcat() which automatically casts the arguments. 2.43 * 2.44 * @param count the total number of strings to concatenate 2.45 * @param s1 first string 2.46 * @param ... all remaining strings 2.47 * @return the concatenated string 2.48 */ 2.49 -#define sstrcat(count, s1, ...) ucx_strcat(count, SCSTR(s1), __VA_ARGS__) 2.50 +#define sstrcat(count, s1, ...) scstrcat(count, SCSTR(s1), __VA_ARGS__) 2.51 2.52 /** 2.53 * Concatenates two or more strings using a UcxAllocator. 2.54 * 2.55 - * See sstrcat() for details. 2.56 + * See scstrcat() for details. 2.57 * 2.58 * @param a the allocator to use 2.59 * @param count the total number of strings to concatenate 2.60 @@ -314,10 +311,10 @@ 2.61 * @param ... all remaining strings 2.62 * @return the concatenated string 2.63 */ 2.64 -sstr_t ucx_strcat_a(UcxAllocator *a, size_t count, scstr_t s1, ...); 2.65 +sstr_t scstrcat_a(UcxAllocator *a, size_t count, scstr_t s1, ...); 2.66 2.67 /** 2.68 - * Alias for ucx_strcat_a() which automatically casts the first string. 2.69 + * Alias for scstrcat_a() which automatically casts the arguments. 2.70 * 2.71 * See sstrcat() for details. 2.72 * 2.73 @@ -328,7 +325,7 @@ 2.74 * @return the concatenated string 2.75 */ 2.76 #define sstrcat_a(a, count, s1, ...) \ 2.77 - ucx_strcat_a(a, count, SCSTR(s1), __VA_ARGS__) 2.78 + scstrcat_a(a, count, SCSTR(s1), __VA_ARGS__) 2.79 2.80 /** 2.81 * Returns a substring starting at the specified location. 2.82 @@ -471,10 +468,10 @@ 2.83 * <code>match</code>, or an empty string, if the sequence is not 2.84 * present in <code>string</code> 2.85 */ 2.86 -sstr_t ucx_sstrstr(sstr_t string, scstr_t match); 2.87 +sstr_t scstrsstr(sstr_t string, scstr_t match); 2.88 2.89 /** 2.90 - * Alias for ucx_sstrstr() which automatically casts the match string. 2.91 + * Alias for scstrsstr() which automatically casts the match string. 2.92 * 2.93 * @param string the string to be scanned 2.94 * @param match string containing the sequence of characters to match 2.95 @@ -482,7 +479,7 @@ 2.96 * <code>match</code>, or an empty string, if the sequence is not 2.97 * present in <code>string</code> 2.98 */ 2.99 -#define sstrstr(string, match) ucx_sstrstr(string, SCSTR(match)) 2.100 +#define sstrstr(string, match) scstrsstr(string, SCSTR(match)) 2.101 2.102 /** 2.103 * Returns an immutable substring starting at the location of the 2.104 @@ -499,10 +496,10 @@ 2.105 * <code>match</code>, or an empty string, if the sequence is not 2.106 * present in <code>string</code> 2.107 */ 2.108 -scstr_t ucx_scstrstr(scstr_t string, scstr_t match); 2.109 +scstr_t scstrscstr(scstr_t string, scstr_t match); 2.110 2.111 /** 2.112 - * Alias for ucx_scstrstr() which automatically casts the match string. 2.113 + * Alias for scstrscstr() which automatically casts the match string. 2.114 * 2.115 * @param string the string to be scanned 2.116 * @param match string containing the sequence of characters to match 2.117 @@ -510,7 +507,7 @@ 2.118 * <code>match</code>, or an empty string, if the sequence is not 2.119 * present in <code>string</code> 2.120 */ 2.121 -#define scstrstr(string, match) ucx_scstrstr(string, SCSTR(match)) 2.122 +#define sstrscstr(string, match) scstrscstr(string, SCSTR(match)) 2.123 2.124 /** 2.125 * Splits a string into parts by using a delimiter string. 2.126 @@ -557,12 +554,12 @@ 2.127 * @return a sstr_t array containing the split strings or 2.128 * <code>NULL</code> on error 2.129 * 2.130 - * @see ucx_strsplit_a() 2.131 + * @see scstrsplit_a() 2.132 */ 2.133 -sstr_t* ucx_strsplit(scstr_t string, scstr_t delim, ssize_t *count); 2.134 +sstr_t* scstrsplit(scstr_t string, scstr_t delim, ssize_t *count); 2.135 2.136 /** 2.137 - * Alias for ucx_strsplit() which automatically casts the arguments. 2.138 + * Alias for scstrsplit() which automatically casts the arguments. 2.139 * 2.140 * @param string the string to split 2.141 * @param delim the delimiter string 2.142 @@ -574,12 +571,12 @@ 2.143 * @see sstrsplit_a() 2.144 */ 2.145 #define sstrsplit(string, delim, count) \ 2.146 - ucx_strsplit(SCSTR(string), SCSTR(delim), count) 2.147 + scstrsplit(SCSTR(string), SCSTR(delim), count) 2.148 2.149 /** 2.150 - * Performing sstrsplit() using a UcxAllocator. 2.151 + * Performing scstrsplit() using a UcxAllocator. 2.152 * 2.153 - * <i>Read the description of sstrsplit() for details.</i> 2.154 + * <i>Read the description of scstrsplit() for details.</i> 2.155 * 2.156 * The memory for the sstr_t.ptr pointers of the array items and the memory for 2.157 * the sstr_t array itself are allocated by using the UcxAllocator.malloc() 2.158 @@ -596,13 +593,13 @@ 2.159 * @return a sstr_t array containing the split strings or 2.160 * <code>NULL</code> on error 2.161 * 2.162 - * @see ucx_strsplit() 2.163 + * @see scstrsplit() 2.164 */ 2.165 -sstr_t* ucx_strsplit_a(UcxAllocator *allocator, scstr_t string, scstr_t delim, 2.166 +sstr_t* scstrsplit_a(UcxAllocator *allocator, scstr_t string, scstr_t delim, 2.167 ssize_t *count); 2.168 2.169 /** 2.170 - * Alias for ucx_strsplit_a() which automatically casts the arguments. 2.171 + * Alias for scstrsplit_a() which automatically casts the arguments. 2.172 * 2.173 * @param allocator the UcxAllocator used for allocating memory 2.174 * @param string the string to split 2.175 @@ -615,7 +612,7 @@ 2.176 * @see sstrsplit() 2.177 */ 2.178 #define sstrsplit_a(allocator, string, delim, count) \ 2.179 - ucx_strsplit_a(allocator, SCSTR(string), SCSTR(delim, count)) 2.180 + scstrsplit_a(allocator, SCSTR(string), SCSTR(delim, count)) 2.181 2.182 /** 2.183 * Compares two UCX strings with standard <code>memcmp()</code>. 2.184 @@ -629,10 +626,10 @@ 2.185 * length of s1 is greater than the length of s2 or the result of 2.186 * <code>memcmp()</code> otherwise (i.e. 0 if the strings match) 2.187 */ 2.188 -int ucx_strcmp(scstr_t s1, scstr_t s2); 2.189 +int scstrcmp(scstr_t s1, scstr_t s2); 2.190 2.191 /** 2.192 - * Alias for ucx_strcmp() which automatically casts its arguments. 2.193 + * Alias for scstrcmp() which automatically casts its arguments. 2.194 * 2.195 * @param s1 the first string 2.196 * @param s2 the second string 2.197 @@ -640,12 +637,12 @@ 2.198 * length of s1 is greater than the length of s2 or the result of 2.199 * <code>memcmp()</code> otherwise (i.e. 0 if the strings match) 2.200 */ 2.201 -#define sstrcmp(s1, s2) ucx_strcmp(SCSTR(s1), SCSTR(s2)) 2.202 +#define sstrcmp(s1, s2) scstrcmp(SCSTR(s1), SCSTR(s2)) 2.203 2.204 /** 2.205 * Compares two UCX strings ignoring the case. 2.206 * 2.207 - * At first it compares the sstr_t.length attribute of the two strings. If and 2.208 + * At first it compares the scstr_t.length attribute of the two strings. If and 2.209 * only if the lengths match, both strings are compared char by char ignoring 2.210 * the case. 2.211 * 2.212 @@ -655,10 +652,10 @@ 2.213 * length of s1 is greater than the length of s2 or the result of the platform 2.214 * specific string comparison function ignoring the case. 2.215 */ 2.216 -int ucx_strcasecmp(scstr_t s1, scstr_t s2); 2.217 +int scstrcasecmp(scstr_t s1, scstr_t s2); 2.218 2.219 /** 2.220 - * Alias for ucx_strcasecmp() which automatically casts the arguments. 2.221 + * Alias for scstrcasecmp() which automatically casts the arguments. 2.222 * 2.223 * @param s1 the first string 2.224 * @param s2 the second string 2.225 @@ -666,7 +663,7 @@ 2.226 * length of s1 is greater than the length of s2 or the result of the platform 2.227 * specific string comparison function ignoring the case. 2.228 */ 2.229 -#define sstrcasecmp(s1, s2) ucx_strcasecmp(SCSTR(s1), SCSTR(s2)) 2.230 +#define sstrcasecmp(s1, s2) scstrcasecmp(SCSTR(s1), SCSTR(s2)) 2.231 2.232 /** 2.233 * Creates a duplicate of the specified string. 2.234 @@ -680,26 +677,26 @@ 2.235 * 2.236 * @param string the string to duplicate 2.237 * @return a duplicate of the string 2.238 - * @see ucx_strdup_a() 2.239 + * @see scstrdup_a() 2.240 */ 2.241 -sstr_t ucx_strdup(scstr_t string); 2.242 +sstr_t scstrdup(scstr_t string); 2.243 2.244 /** 2.245 - * Alias for ucx_strdup() which automatically casts the argument. 2.246 + * Alias for scstrdup() which automatically casts the argument. 2.247 * 2.248 * @param string the string to duplicate 2.249 * @return a duplicate of the string 2.250 * @see sstrdup_a() 2.251 */ 2.252 -#define sstrdup(string) ucx_strdup(SCSTR(string)) 2.253 +#define sstrdup(string) scstrdup(SCSTR(string)) 2.254 2.255 /** 2.256 * Creates a duplicate of the specified string using a UcxAllocator. 2.257 * 2.258 * The new sstr_t will contain a copy allocated by the allocators 2.259 - * ucx_allocator_malloc function. So it is implementation depended, whether the 2.260 + * UcxAllocator.malloc() function. So it is implementation depended, whether the 2.261 * returned sstr_t.ptr pointer must be passed to the allocators 2.262 - * ucx_allocator_free function manually. 2.263 + * UcxAllocator.free() function manually. 2.264 * 2.265 * The sstr_t.ptr of the return value will <i>always</i> be <code>NULL</code>- 2.266 * terminated and mutable, regardless of the argument. 2.267 @@ -707,19 +704,19 @@ 2.268 * @param allocator a valid instance of a UcxAllocator 2.269 * @param string the string to duplicate 2.270 * @return a duplicate of the string 2.271 - * @see ucx_strdup() 2.272 + * @see scstrdup() 2.273 */ 2.274 -sstr_t ucx_strdup_a(UcxAllocator *allocator, scstr_t string); 2.275 +sstr_t scstrdup_a(UcxAllocator *allocator, scstr_t string); 2.276 2.277 /** 2.278 - * Alias for ucx_strdup_a() which automatically casts the argument. 2.279 + * Alias for scstrdup_a() which automatically casts the argument. 2.280 * 2.281 * @param allocator a valid instance of a UcxAllocator 2.282 * @param string the string to duplicate 2.283 * @return a duplicate of the string 2.284 - * @see ucx_strdup() 2.285 + * @see scstrdup() 2.286 */ 2.287 -#define sstrdup_a(allocator, string) ucx_strdup_a(allocator, SCSTR(string)) 2.288 +#define sstrdup_a(allocator, string) scstrdup_a(allocator, SCSTR(string)) 2.289 2.290 2.291 /** 2.292 @@ -766,16 +763,16 @@ 2.293 * @param prefix the prefix the string should have 2.294 * @return 1, if and only if the string has the specified prefix, 0 otherwise 2.295 */ 2.296 -int ucx_strprefix(scstr_t string, scstr_t prefix); 2.297 +int scstrprefix(scstr_t string, scstr_t prefix); 2.298 2.299 /** 2.300 - * Alias for ucx_strprefix() which automatically casts the arguments. 2.301 + * Alias for scstrprefix() which automatically casts the arguments. 2.302 * 2.303 * @param string the string to check 2.304 * @param prefix the prefix the string should have 2.305 * @return 1, if and only if the string has the specified prefix, 0 otherwise 2.306 */ 2.307 -#define sstrprefix(string, prefix) ucx_strprefix(SCSTR(string), SCSTR(prefix)) 2.308 +#define sstrprefix(string, prefix) scstrprefix(SCSTR(string), SCSTR(prefix)) 2.309 2.310 /** 2.311 * Checks, if a string has a specific suffix. 2.312 @@ -783,16 +780,16 @@ 2.313 * @param suffix the suffix the string should have 2.314 * @return 1, if and only if the string has the specified suffix, 0 otherwise 2.315 */ 2.316 -int ucx_strsuffix(scstr_t string, scstr_t suffix); 2.317 +int scstrsuffix(scstr_t string, scstr_t suffix); 2.318 2.319 /** 2.320 - * Alias for ucx_strsuffix() which automatically casts the arguments. 2.321 + * Alias for scstrsuffix() which automatically casts the arguments. 2.322 * 2.323 * @param string the string to check 2.324 * @param suffix the suffix the string should have 2.325 * @return 1, if and only if the string has the specified suffix, 0 otherwise 2.326 */ 2.327 -#define sstrsuffix(string, suffix) ucx_strsuffix(SCSTR(string), SCSTR(suffix)) 2.328 +#define sstrsuffix(string, suffix) scstrsuffix(SCSTR(string), SCSTR(suffix)) 2.329 2.330 /** 2.331 * Returns a lower case version of a string. 2.332 @@ -804,15 +801,15 @@ 2.333 * @return the resulting lower case string 2.334 * @see scstrdup() 2.335 */ 2.336 -sstr_t ucx_strlower(scstr_t string); 2.337 +sstr_t scstrlower(scstr_t string); 2.338 2.339 /** 2.340 - * Alias for ucx_strlower() which automatically casts the argument. 2.341 + * Alias for scstrlower() which automatically casts the argument. 2.342 * 2.343 * @param string the input string 2.344 * @return the resulting lower case string 2.345 */ 2.346 -#define sstrlower(string) ucx_strlower(SCSTR(string)) 2.347 +#define sstrlower(string) scstrlower(SCSTR(string)) 2.348 2.349 /** 2.350 * Returns a lower case version of a string. 2.351 @@ -825,17 +822,17 @@ 2.352 * @return the resulting lower case string 2.353 * @see scstrdup_a() 2.354 */ 2.355 -sstr_t ucx_strlower_a(UcxAllocator *allocator, scstr_t string); 2.356 +sstr_t scstrlower_a(UcxAllocator *allocator, scstr_t string); 2.357 2.358 2.359 /** 2.360 - * Alias for ucx_strlower_a() which automatically casts the argument. 2.361 + * Alias for scstrlower_a() which automatically casts the argument. 2.362 * 2.363 * @param allocator the allocator used for duplicating the string 2.364 * @param string the input string 2.365 * @return the resulting lower case string 2.366 */ 2.367 -#define sstrlower_a(allocator, string) ucx_strlower_a(allocator, SCSTR(string)) 2.368 +#define sstrlower_a(allocator, string) scstrlower_a(allocator, SCSTR(string)) 2.369 2.370 /** 2.371 * Returns a upper case version of a string. 2.372 @@ -847,15 +844,15 @@ 2.373 * @return the resulting upper case string 2.374 * @see scstrdup() 2.375 */ 2.376 -sstr_t ucx_strupper(scstr_t string); 2.377 +sstr_t scstrupper(scstr_t string); 2.378 2.379 /** 2.380 - * Alias for ucx_strupper() which automatically casts the argument. 2.381 + * Alias for scstrupper() which automatically casts the argument. 2.382 * 2.383 * @param string the input string 2.384 * @return the resulting upper case string 2.385 */ 2.386 -#define sstrupper(string) ucx_strupper(SCSTR(string)) 2.387 +#define sstrupper(string) scstrupper(SCSTR(string)) 2.388 2.389 /** 2.390 * Returns a upper case version of a string. 2.391 @@ -868,16 +865,16 @@ 2.392 * @return the resulting upper case string 2.393 * @see scstrdup_a() 2.394 */ 2.395 -sstr_t ucx_strupper_a(UcxAllocator *allocator, scstr_t string); 2.396 +sstr_t scstrupper_a(UcxAllocator *allocator, scstr_t string); 2.397 2.398 /** 2.399 - * Alias for ucx_strupper_a() which automatically casts the argument. 2.400 + * Alias for scstrupper_a() which automatically casts the argument. 2.401 * 2.402 * @param allocator the allocator used for duplicating the string 2.403 * @param string the input string 2.404 * @return the resulting upper case string 2.405 */ 2.406 -#define sstrupper_a(allocator, string) ucx_strupper_a(allocator, string) 2.407 +#define sstrupper_a(allocator, string) scstrupper_a(allocator, string) 2.408 2.409 #ifdef __cplusplus 2.410 }
