From 728e050a05849c2e4acf7378743f044545de3699 Mon Sep 17 00:00:00 2001
From: Steffen Jaeckel <jaeckel-floss@eyet-services.de>
Date: Tue, 1 Feb 2022 13:30:34 +0100
Subject: [PATCH] make `strtok_r` private

Fixes #189

Signed-off-by: Steffen Jaeckel <jaeckel-floss@eyet-services.de>
---
 src/stanza.c        | 6 +++---
 src/util.c          | 2 +-
 src/util.h          | 2 +-
 tests/test_string.c | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/stanza.c b/src/stanza.c
index 0c36610..7be79b7 100644
--- a/src/stanza.c
+++ b/src/stanza.c
@@ -883,13 +883,13 @@ xmpp_stanza_t *xmpp_stanza_get_child_by_path(xmpp_stanza_t *stanza, ...)
             break;
         }
         saveattr = ns = NULL;
-        attr = xmpp_strtok_r(tok, "[", &saveattr);
+        attr = strophe_strtok_r(tok, "[", &saveattr);
         if (attr) {
-            attr = xmpp_strtok_r(NULL, "]", &saveattr);
+            attr = strophe_strtok_r(NULL, "]", &saveattr);
             if (attr) {
                 if (!strncmp(attr, "@ns='", 5)) {
                     ns = attr + 5;
-                    xmpp_strtok_r(ns, "'", &saveattr);
+                    strophe_strtok_r(ns, "'", &saveattr);
                 }
             }
         }
diff --git a/src/util.c b/src/util.c
index b298071..e3d1794 100644
--- a/src/util.c
+++ b/src/util.c
@@ -80,7 +80,7 @@ char *strophe_strndup(const xmpp_ctx_t *ctx, const char *s, size_t len)
  *  For example, visual studio older than 2005 doesn't provide strtok_r()
  *  nor strtok_s().
  */
-char *xmpp_strtok_r(char *s, const char *delim, char **saveptr)
+char *strophe_strtok_r(char *s, const char *delim, char **saveptr)
 {
     size_t len;
 
diff --git a/src/util.h b/src/util.h
index f94b9ab..3fba5e8 100644
--- a/src/util.h
+++ b/src/util.h
@@ -26,7 +26,7 @@
 #define xmpp_min(x, y) ((x) < (y) ? (x) : (y))
 
 /* string functions */
-char *xmpp_strtok_r(char *s, const char *delim, char **saveptr);
+char *strophe_strtok_r(char *s, const char *delim, char **saveptr);
 
 /* timing functions */
 uint64_t time_stamp(void);
diff --git a/tests/test_string.c b/tests/test_string.c
index 2777b18..6d3f0d9 100644
--- a/tests/test_string.c
+++ b/tests/test_string.c
@@ -41,19 +41,19 @@ static int test_strtok_r(void)
     assert(strcmp(s1, s2) == 0);
 
     sub1 = strtok_r(s1, "-", &sp1);
-    sub2 = xmpp_strtok_r(s2, "-", &sp2);
+    sub2 = strophe_strtok_r(s2, "-", &sp2);
     if (strcmp(sub1, sub2) != 0) {
         printf("1st token is '%s', must be '%s'\n", sub2, sub1);
         return -1;
     }
     sub1 = strtok_r(NULL, "-=", &sp1);
-    sub2 = xmpp_strtok_r(NULL, "-=", &sp2);
+    sub2 = strophe_strtok_r(NULL, "-=", &sp2);
     if (strcmp(sub1, sub2) != 0) {
         printf("2nd token is '%s', must be '%s'\n", sub2, sub1);
         return -1;
     }
     sub1 = strtok_r(NULL, "-", &sp1);
-    sub2 = xmpp_strtok_r(NULL, "-", &sp2);
+    sub2 = strophe_strtok_r(NULL, "-", &sp2);
     if (sub1 != sub2) {
         printf("3rd call returns %p instead of NULL\n", sub2);
         return -1;