From: Volker Lendecke <vl@samba.org>
Date: Wed, 29 Apr 2020 07:07:20 +0000 (+0200)
Subject: lib: Move push_skip_string() to clirap2.c
X-Git-Tag: ldb-2.2.0~745
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1226f435495cabaf95eda3280f75dd0388cde5a1;p=thirdparty%2Fsamba.git

lib: Move push_skip_string() to clirap2.c

It's only used there

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
---

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 0fd6e64fee3..3bd336c1d37 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -584,7 +584,6 @@ bool next_token(const char **ptr, char *buff, const char *sep, size_t bufsize);
 bool strnequal(const char *s1,const char *s2,size_t n);
 bool strcsequal(const char *s1,const char *s2);
 bool strnorm(char *s, int case_default);
-char *push_skip_string(char *buf);
 char *skip_string(const char *base, size_t len, char *buf);
 size_t str_charnum(const char *s);
 bool trim_char(char *s,char cfront,char cback);
diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c
index cc3c257e41d..c62cbe16a59 100644
--- a/source3/lib/util_str.c
+++ b/source3/lib/util_str.c
@@ -63,16 +63,6 @@ bool strnorm(char *s, int case_default)
 		return strlower_m(s);
 }
 
-/**
- *  Skip past some strings in a buffer - old version - no checks.
- *  **/
-
-char *push_skip_string(char *buf)
-{
-	buf += strlen(buf) + 1;
-	return(buf);
-}
-
 /**
  Skip past a string in a buffer. Buffer may not be
  null terminated. end_ptr points to the first byte after
diff --git a/source3/utils/clirap2.c b/source3/utils/clirap2.c
index 5607f7a4114..f72afadc651 100644
--- a/source3/utils/clirap2.c
+++ b/source3/utils/clirap2.c
@@ -117,6 +117,16 @@
 
 #define GETRES(p,endp) ((p && p+2 < endp) ? SVAL(p,0) : -1)
 
+/**
+ *  Skip past some strings in a buffer - old version - no checks.
+ *  **/
+
+static char *push_skip_string(char *buf)
+{
+	buf += strlen(buf) + 1;
+	return(buf);
+}
+
 /* put string s at p with max len n and increment p past string */
 #define PUTSTRING(p,s,n) \
 	do {\