]> granicus.if.org Git - file/commitdiff
don't check for NULL. It can't be.
authorChristos Zoulas <christos@zoulas.com>
Tue, 17 Feb 2009 16:29:03 +0000 (16:29 +0000)
committerChristos Zoulas <christos@zoulas.com>
Tue, 17 Feb 2009 16:29:03 +0000 (16:29 +0000)
src/apprentice.c

index 5b611285b3bd319f1ed4ce48412982894ad21bd0..6884a0aa34bebee7cc462b0b99f02224973a476b 100644 (file)
@@ -32,7 +32,7 @@
 #include "file.h"
 
 #ifndef        lint
-FILE_RCSID("@(#)$File: apprentice.c,v 1.148 2009/02/04 18:24:32 christos Exp $")
+FILE_RCSID("@(#)$File: apprentice.c,v 1.149 2009/02/10 16:17:47 christos Exp $")
 #endif /* lint */
 
 #include "magic.h"
@@ -1716,8 +1716,7 @@ check_format(struct magic_set *ms, struct magic *m)
                 * string is not one character long
                 */
                file_magwarn(ms, "Printf format `%c' is not valid for type "
-                   "`%s' in description `%s'",
-                   ptr && *ptr ? *ptr : '?',
+                   "`%s' in description `%s'", *ptr ? *ptr : '?',
                    file_names[m->type], m->desc);
                return -1;
        }