summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristos Zoulas <christos@zoulas.com>2011-09-16 21:04:59 +0000
committerChristos Zoulas <christos@zoulas.com>2011-09-16 21:04:59 +0000
commit4592c887c41e63ada70fef556949ddf4c855fc8a (patch)
tree44cc521cbb64f51912feb81c86a0e1f6292d14b2 /src
parent9605dca59f13f25bebd07b3fda894b14651b41a3 (diff)
downloadfile-git-4592c887c41e63ada70fef556949ddf4c855fc8a.tar.gz
fix warnings
Diffstat (limited to 'src')
-rw-r--r--src/apprentice.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/apprentice.c b/src/apprentice.c
index 11950cf3..ef76a34b 100644
--- a/src/apprentice.c
+++ b/src/apprentice.c
@@ -32,7 +32,7 @@
#include "file.h"
#ifndef lint
-FILE_RCSID("@(#)$File: apprentice.c,v 1.170 2011/06/10 09:23:28 christos Exp $")
+FILE_RCSID("@(#)$File: apprentice.c,v 1.171 2011/09/16 21:04:59 christos Exp $")
#endif /* lint */
#include "magic.h"
@@ -1451,8 +1451,8 @@ parse(struct magic_set *ms, struct magic_entry **mentryp, uint32_t *nmentryp,
goto bad;
m->str_flags |= PSTRING_LENGTH_INCLUDES_ITSELF;
break;
- bad:
default:
+ bad:
if (ms->flags & MAGIC_CHECK)
file_magwarn(ms,
"string extension `%c' "
@@ -2085,7 +2085,7 @@ out:
*p = '\0';
m->vallen = CAST(unsigned char, (p - origp));
if (m->type == FILE_PSTRING)
- m->vallen += file_pstring_length_size(m);
+ m->vallen += (unsigned char)file_pstring_length_size(m);
return s;
}