andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lib/mount-broker: move utility functions to common-utils

Browse Source 
functions skipwhite and nwstrtail have been moved from
mount-broker to common-utils library for general use.

Change-Id: I9cfefb28bbfcf5d0bd37e35865ff3f3b7923fc53
BUG: 765464
Signed-off-by: Rajesh Amaravathi <rajesh@redhat.com>
Reviewed-on: http://review.gluster.com/2560
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vijay@gluster.com>
Reviewed-by: Csaba Henk <csaba@gluster.com>
This commit is contained in:
Rajesh Amaravathi 2012-01-04 13:06:29 +05:30 committed by Vijay Bellur
parent ea275f8cfe
commit 22282b4fb8
3 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libglusterfs/src/common-utils.c
View File

@ -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)

2
libglusterfs/src/common-utils.h
View File

@ -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);

27
xlators/mgmt/glusterd/src/glusterd-mountbroker.c
View File

@ -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