diff options
| author | obrien <obrien@FreeBSD.org> | 2006-06-21 09:28:00 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2006-06-21 09:28:00 +0000 |
| commit | aad45ca6a01bf8abf012ac7ec18ca7aa22333086 (patch) | |
| tree | 960f8be386753a0a20204d96c6254f46f2dedad7 /contrib | |
| parent | 64bd8eb06af3bdd51f0f2e2a86b175c1f84aeb0e (diff) | |
| parent | 0af3611cb630b0c4b7858a027487eec4d9f8d35c (diff) | |
| download | FreeBSD-src-aad45ca6a01bf8abf012ac7ec18ca7aa22333086.zip FreeBSD-src-aad45ca6a01bf8abf012ac7ec18ca7aa22333086.tar.gz | |
This commit was generated by cvs2svn to compensate for changes in r159825,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/file/apprentice.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/file/apprentice.c b/contrib/file/apprentice.c index 4432a56..a5bc4f2 100644 --- a/contrib/file/apprentice.c +++ b/contrib/file/apprentice.c @@ -380,8 +380,8 @@ apprentice_file(struct magic_set *ms, struct magic **magicp, uint32_t *nmagicp, return -1; } - maxmagic = MAXMAGIS; - if ((marray = malloc(maxmagic * sizeof(*marray))) == NULL) { + maxmagic = MAXMAGIS; + if ((marray = calloc(maxmagic, sizeof(*marray))) == NULL) { (void)fclose(f); file_oomem(ms); return -1; @@ -509,7 +509,7 @@ parse(struct magic_set *ms, struct magic_entry **mentryp, uint32_t *nmentryp, char *t; private const char *fops = FILE_OPS; uint32_t val; - uint32_t cont_level, cont_count; + uint32_t cont_level; cont_level = 0; |
