summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libglusterfs/src/common-utils.c24
-rw-r--r--libglusterfs/src/common-utils.h2
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-mountbroker.c27
3 files changed, 27 insertions, 26 deletions
diff --git a/libglusterfs/src/common-utils.c b/libglusterfs/src/common-utils.c
index 6a5e2504b75..1d0fb822fc5 100644
--- a/libglusterfs/src/common-utils.c
+++ b/libglusterfs/src/common-utils.c
@@ -1583,6 +1583,30 @@ strtail (char *str, const char *pattern)
return NULL;
}
+void
+skipwhite (char **s)
+{
+ while (isspace (**s))
+ (*s)++;
+}
+
+char *
+nwstrtail (char *str, char *pattern)
+{
+ for (;;) {
+ skipwhite (&str);
+ skipwhite (&pattern);
+
+ if (*str != *pattern || !*str)
+ break;
+
+ str++;
+ pattern++;
+ }
+
+ return *pattern ? NULL : str;
+}
+
/* RFC 1123 & 952 */
char
valid_host_name (char *address, int length)
diff --git a/libglusterfs/src/common-utils.h b/libglusterfs/src/common-utils.h
index a253e675150..4cb3843d980 100644
--- a/libglusterfs/src/common-utils.h
+++ b/libglusterfs/src/common-utils.h
@@ -407,6 +407,8 @@ int log_base2 (unsigned long x);
int get_checksum_for_path (char *path, uint32_t *checksum);
char *strtail (char *str, const char *pattern);
+void skipwhite (char **s);
+char *nwstrtail (char *str, char *pattern);
char valid_host_name (char *address, int length);
char valid_ipv4_address (char *address, int length);
diff --git a/xlators/mgmt/glusterd/src/glusterd-mountbroker.c b/xlators/mgmt/glusterd/src/glusterd-mountbroker.c
index b00145f8c11..32adf4ddd6c 100644
--- a/xlators/mgmt/glusterd/src/glusterd-mountbroker.c
+++ b/xlators/mgmt/glusterd/src/glusterd-mountbroker.c
@@ -38,7 +38,7 @@
#include "glusterd-mem-types.h"
#include "glusterd.h"
#include "glusterd-utils.h"
-
+#include "common-utils.h"
#include "glusterd-mountbroker.h"
#include "glusterd-op-sm.h"
@@ -63,31 +63,6 @@ seq_dict_foreach (dict_t *dict,
}
}
-static void
-skipwhite (char **s)
-{
- while (isspace (**s))
- (*s)++;
-}
-
-static char *
-nwstrtail (char *str, char *pattern)
-{
- for (;;) {
- skipwhite (&str);
- skipwhite (&pattern);
-
- if (*str != *pattern || !*str)
- break;
-
- str++;
- pattern++;
- }
-
- return *pattern ? NULL : str;
-}
-
-
int
parse_mount_pattern_desc (gf_mount_spec_t *mspec, char *pdesc)
#define SYNTAX_ERR -2