summaryrefslogtreecommitdiff
path: root/source4/lib/util/ms_fnmatch.c
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-09-09 19:34:30 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 15:05:49 -0500
commit7e297ecfa4db2c7ab720a63c7764bc0e20f8058c (patch)
tree6fdb0b5a3a713c5aab9669ef021456b2063919e6 /source4/lib/util/ms_fnmatch.c
parent43742e53c900733cf0eff085cb073d0c1c937530 (diff)
downloadsamba-7e297ecfa4db2c7ab720a63c7764bc0e20f8058c.tar.gz
samba-7e297ecfa4db2c7ab720a63c7764bc0e20f8058c.tar.bz2
samba-7e297ecfa4db2c7ab720a63c7764bc0e20f8058c.zip
r25047: Fix more warnings.
(This used to be commit 69de86d2d2e49439760fbc61901eb87fb7fc5d55)
Diffstat (limited to 'source4/lib/util/ms_fnmatch.c')
-rw-r--r--source4/lib/util/ms_fnmatch.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/source4/lib/util/ms_fnmatch.c b/source4/lib/util/ms_fnmatch.c
index 8e216b0226..73fb0e0966 100644
--- a/source4/lib/util/ms_fnmatch.c
+++ b/source4/lib/util/ms_fnmatch.c
@@ -201,11 +201,10 @@ int ms_fnmatch(const char *pattern, const char *string, enum protocol_types prot
if (pattern[i] == '*' || pattern[i] == '<') count++;
}
- max_n = talloc_array(NULL, struct max_n, count);
- if (!max_n) {
+ max_n = talloc_zero_array(NULL, struct max_n, count);
+ if (max_n == NULL) {
return -1;
}
- memset(max_n, 0, sizeof(struct max_n) * count);
ret = ms_fnmatch_core(pattern, string, max_n, strrchr(string, '.'));