From: Pavel Charvat Date: Wed, 8 Feb 2012 13:58:46 +0000 (+0100) Subject: Added consts to functions for matching of prefixes and suffixes. X-Git-Tag: v5.0~74^2 X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=c681101e384bb5633396364586b0d3667238d755;p=libucw.git Added consts to functions for matching of prefixes and suffixes. --- diff --git a/ucw/str-fix.c b/ucw/str-fix.c index deb128e8..a220f621 100644 --- a/ucw/str-fix.c +++ b/ucw/str-fix.c @@ -13,14 +13,14 @@ #include int -str_has_prefix(char *str, char *prefix) +str_has_prefix(const char *str, const char *prefix) { size_t pxlen = strlen(prefix); return !strncmp(str, prefix, pxlen); } int -str_has_suffix(char *str, char *suffix) +str_has_suffix(const char *str, const char *suffix) { size_t sxlen = strlen(suffix); size_t len = strlen(str); @@ -32,7 +32,7 @@ str_has_suffix(char *str, char *suffix) } int -str_hier_prefix(char *str, char *prefix, uns sep) +str_hier_prefix(const char *str, const char *prefix, uns sep) { while (*str && *prefix) { @@ -54,10 +54,10 @@ str_hier_prefix(char *str, char *prefix, uns sep) } int -str_hier_suffix(char *str, char *suffix, uns sep) +str_hier_suffix(const char *str, const char *suffix, uns sep) { - char *st = str + strlen(str); - char *sx = suffix + strlen(suffix); + const char *st = str + strlen(str); + const char *sx = suffix + strlen(suffix); while (st > str && sx > suffix) { size_t sl=0, pl=0; diff --git a/ucw/string.h b/ucw/string.h index 2583a357..b5faa9ac 100644 --- a/ucw/string.h +++ b/ucw/string.h @@ -92,8 +92,8 @@ const char *hex_to_mem(byte *dest, const char *src, uns max_bytes, uns flags); /* str-fix.c */ -int str_has_prefix(char *str, char *prefix); /** Tests if @str starts with @prefix. **/ -int str_has_suffix(char *str, char *suffix); /** Tests if @str ends with @suffix. **/ +int str_has_prefix(const char *str, const char *prefix); /** Tests if @str starts with @prefix. **/ +int str_has_suffix(const char *str, const char *suffix); /** Tests if @str ends with @suffix. **/ /** * Let @str and @prefix be hierarchical names with components separated by @@ -110,7 +110,7 @@ int str_has_suffix(char *str, char *suffix); /** Tests if @str ends with @suffi * - "/" is a prefix, * - "" is a prefix. **/ -int str_hier_prefix(char *str, char *prefix, uns sep); -int str_hier_suffix(char *str, char *suffix, uns sep); /** Like @str_hier_prefix(), but for suffixes. **/ +int str_hier_prefix(const char *str, const char *prefix, uns sep); +int str_hier_suffix(const char *str, const char *suffix, uns sep); /** Like @str_hier_prefix(), but for suffixes. **/ #endif