Make index_of_char() static again

Change-Id: I1c0d344c50ee5d78dd8247ccfe795ce0cd94aaa2
Reviewed-on: https://code.wireshark.org/review/17230
Reviewed-by: Balint Reczey <balint@balintreczey.hu>

3 files changed, 20 insertions, 27 deletions

diff --git a/epan/dissectors/packet-multipart.c b/epan/dissectors/packet-multipart.c
index f4297c0880..7b728b9455 100644
--- a/epan/dissectors/packet-multipart.c
+++ b/epan/dissectors/packet-multipart.c
@@ -311,6 +311,25 @@ unfold_and_compact_mime_header(const char *lines, gint *first_colon_offset)
     return (ret);
 }
 
+/* Return the index of a given char in the given string,
+ * or -1 if not found.
+ */
+static gint
+index_of_char(const char *str, const char c)
+{
+    gint len = 0;
+    const char *p = str;
+
+    while (*p && *p != c) {
+        p++;
+        len++;
+    }
+
+    if (*p)
+        return len;
+    return -1;
+}
+
 /* Retrieve the media information from pinfo->private_data,
  * and compute the boundary string and its length.
  * Return a pointer to a filled-in multipart_info_t, or NULL on failure.
diff --git a/epan/media_params.c b/epan/media_params.c
index d7db16df8f..dbfd7ba35d 100644
--- a/epan/media_params.c
+++ b/epan/media_params.c
@@ -33,25 +33,6 @@
 
 #include <epan/media_params.h>
 
-/* Return the index of a given char in the given string,
- * or -1 if not found.
- */
-gint
-index_of_char(const char *str, const char c)
-{
-    gint len = 0;
-    const char *p = str;
-
-    while (*p && *p != c) {
-        p++;
-        len++;
-    }
-
-    if (*p)
-        return len;
-    return -1;
-}
-
 char *
 ws_find_media_type_parameter(const char *parameters, const char *key, int *retlen)
 {
@@ -98,8 +79,7 @@ ws_find_media_type_parameter(const char *parameters, const char *key, int *retle
          * Parameter value is a quoted-string
          */
         start++; /* Skip the quote */
-        len = index_of_char(start, '"');
-        if (len < 0) {
+        if (NULL == strchr(start, '"')) {
             /*
              * No closing quote
              */
diff --git a/epan/media_params.h b/epan/media_params.h
index 1137ba68fa..0be153cc66 100644
--- a/epan/media_params.h
+++ b/epan/media_params.h
@@ -36,12 +36,6 @@
 extern "C" {
 #endif /* __cplusplus */
 
-/* Return the index of a given char in the given string,
- * or -1 if not found.
- */
-WS_DLL_PUBLIC gint
-index_of_char(const char *str, const char c);
-
 WS_DLL_PUBLIC char *
 ws_find_media_type_parameter(const char *parameters, const char *key, int *retlen);