diff --git a/jv.c b/jv.c index 020e65b9..b93854b3 100644 --- a/jv.c +++ b/jv.c @@ -627,7 +627,7 @@ jv jv_string_indexes(jv j, jv k) { jv a = jv_array(); p = jstr; - while ((p = jq_memmem(p, (jstr + jlen) - p, idxstr, idxlen)) != NULL) { + while ((p = _jq_memmem(p, (jstr + jlen) - p, idxstr, idxlen)) != NULL) { a = jv_array_append(a, jv_number(p - jstr)); p += idxlen; } @@ -649,7 +649,7 @@ jv jv_string_split(jv j, jv sep) { assert(jv_get_refcnt(a) == 1); for (p = jstr; p < jstr + jlen; p = s + seplen) { - s = jq_memmem(p, (jstr + jlen) - p, sepstr, seplen); + s = _jq_memmem(p, (jstr + jlen) - p, sepstr, seplen); if (s == NULL) s = jstr + jlen; a = jv_array_append(a, jv_string_sized(p, s - p)); diff --git a/util.c b/util.c index da0b40c4..08ec715c 100644 --- a/util.c +++ b/util.c @@ -92,8 +92,8 @@ jv jq_realpath(jv path) { return path; } -const void *jq_memmem(const void *haystack, size_t haystacklen, - const void *needle, size_t needlelen) { +const void *_jq_memmem(const void *haystack, size_t haystacklen, + const void *needle, size_t needlelen) { #ifdef HAVE_MEMMEM return (const void*)memmem(haystack, haystacklen, needle, needlelen); #else diff --git a/util.h b/util.h index f2df3909..6e3cb9f0 100644 --- a/util.h +++ b/util.h @@ -7,8 +7,8 @@ jv expand_path(jv); jv get_home(void); jv jq_realpath(jv); -const void *jq_memmem(const void *haystack, size_t haystacklen, - const void *needle, size_t needlelen); +const void *_jq_memmem(const void *haystack, size_t haystacklen, + const void *needle, size_t needlelen); #ifndef MIN #define MIN(a,b) \