diff options
| author | Jeremy Allison <jra@samba.org> | 2000-03-10 19:50:03 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2000-03-10 19:50:03 +0000 |
| commit | 5e22394654eba2ed5d01e81b165a044a59dd65ab (patch) | |
| tree | 5d2e03370ee24200bbe8b47b13109c47dc58e1c7 /source3/lib/util.c | |
| parent | 83ee9372fc18eaef6d00fbc7c1fb68747e2303bb (diff) | |
| download | samba-5e22394654eba2ed5d01e81b165a044a59dd65ab.tar.gz samba-5e22394654eba2ed5d01e81b165a044a59dd65ab.tar.bz2 samba-5e22394654eba2ed5d01e81b165a044a59dd65ab.zip | |
Fixups for compiles with gcc flags -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual
Partially implemented rpc daemon redirect (needs more work).
Jeremy.
(This used to be commit a462191698fa589ceac4afd14c652adf699eccad)
Diffstat (limited to 'source3/lib/util.c')
| -rw-r--r-- | source3/lib/util.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/lib/util.c b/source3/lib/util.c index 772ac2f9ef..3c86570af1 100644 --- a/source3/lib/util.c +++ b/source3/lib/util.c @@ -1028,10 +1028,6 @@ BOOL unix_do_match(char *str, char *regexp, BOOL case_sig) { char *p; - - while(*str && (case_sig ? (*p != *str) : (toupper(*p)!=toupper(*str)))) - str++; - for( p = regexp; *p && *str; ) { switch(*p) { case '?': @@ -1047,6 +1043,10 @@ BOOL unix_do_match(char *str, char *regexp, BOOL case_sig) if(!*p) return True; /* Automatic match */ while(*str) { + + while(*str && (case_sig ? (*p != *str) : (toupper(*p)!=toupper(*str)))) + str++; + /* * Patch from weidel@multichart.de. In the case of the regexp * '*XX*' we want to ensure there are at least 2 'X' characters @@ -1130,7 +1130,7 @@ static BOOL unix_mask_match(char *str, char *regexp, BOOL case_sig) { char *p; pstring p1, p2; - fstring ebase,eext,sbase,sext; + fstring ebase,sbase; BOOL matched; /* Make local copies of str and regexp */ |