[PATCH 2 of 2] Fix two warnings "the address of 'foo' will always evaluate as 'true'"
# HG changeset patch
# User Matthias Andree <matthias.andree@xxxxxx>
# Date 1248385934 -7200
# Branch HEAD
# Node ID fc00838d5734ea560ac013565226c000fe7e4df4
# Parent 02a82e1ae8cbfaae70e10554198441c150ba1648
Fix two warnings "the address of 'foo' will always evaluate as 'true'".
diff -r 02a82e1ae8cb -r fc00838d5734 bcache.c
--- a/bcache.c Thu Jul 23 23:51:30 2009 +0200
+++ b/bcache.c Thu Jul 23 23:52:14 2009 +0200
@@ -66,7 +66,7 @@
mutt_encode_path (path, sizeof (path), NONULL (mailbox));
len = snprintf (dst, dstlen-1, "%s/%s%s%s", MessageCachedir,
- host, NONULL (path),
+ host, path,
(*path && path[mutt_strlen (path) - 1] == '/') ? "" : "/");
dprint (3, (debugfile, "bcache_path: rc: %d, path: '%s'\n", len, dst));
diff -r 02a82e1ae8cb -r fc00838d5734 charset.c
--- a/charset.c Thu Jul 23 23:51:30 2009 +0200
+++ b/charset.c Thu Jul 23 23:52:14 2009 +0200
@@ -267,7 +267,7 @@
else if (!ascii_strncasecmp (in, "iso8859-", 8))
snprintf (scratch, sizeof (scratch), "iso_8859-%s", in + 8);
else
- strfcpy (scratch, NONULL(in), sizeof (scratch));
+ strfcpy (scratch, in, sizeof (scratch));
for (i = 0; PreferredMIMENames[i].key; i++)
if (!ascii_strcasecmp (scratch, PreferredMIMENames[i].key) ||