Minor stylistic tweaking.

diff --git a/src/file.c b/src/file.c
index 65af4d00e8d5fe0ab743d68b32c1864fc704bd07..65b530be3b1d64b0eba07a7ee5ac2f511065c565 100644 (file)
--- a/src/file.c
+++ b/src/file.c
@@ -153,7 +153,7 @@ readit:
                         */
                        ckfputs("data", stdout);
                }
-               if (0 != strcmp("-", inname)) {
+               if (strcmp("-", inname) != 0) {
                        /*
                         * Restore access, modification times if we read it.
                         */

diff --git a/src/softmagic.c b/src/softmagic.c
index b6e45a050d703e14631c43f3a5d6841da93e88d3..f03f4600b86c9bb6f79679199a030f5c2ddf26aa 100644 (file)
--- a/src/softmagic.c
+++ b/src/softmagic.c
@@ -110,7 +110,8 @@ struct magic *m;
                l = 0;
                /* What we want here is:
                 * v = strncmp(m->value.s, p->s, m->vallen);
-                * but ignoring any nulls.  bcmp doesn't give -/+/0.
+                * but ignoring any nulls.  bcmp doesn't give -/+/0
+                * and isn't universally available anyway.
                 */
                {
                        register unsigned char *a = (unsigned char*)m->value.s;
@@ -118,7 +119,8 @@ struct magic *m;
                        register int len = m->vallen;
 
                        while (--len >= 0)
-                               if (0 != (v = *b++ - *a++)) break;
+                               if ((v = *b++ - *a++) != 0)
+                                       break;
                }
                break;
        default: