Ticket #1923: 1923-getting-out-assignments-from-some-ifs.patch

edit/choosesyntax.c

@@ -77 +77 @@
     edit_load_syntax (NULL, &names, NULL);
     while (names[count++] != NULL);
     qsort(names, count - 1, sizeof(char*), pstrcmp);
-
-    if ((syntax = exec_edit_syntax_dialog ((const char**) names)) < 0) {
+    syntax = exec_edit_syntax_dialog ((const char**) names);
+    if (syntax < 0) {
         for (i = 0; names[i]; i++) {
             g_free (names[i]);
         }

edit/edit.c

@@ -294 +294 @@
     edit->curs2 = edit->last_byte;
     buf2 = edit->curs2 >> S_EDIT_BUF_SIZE;
     edit->utf8 = 0;
-    if ((file = mc_open (filename, O_RDONLY | O_BINARY)) == -1) {
+    file = mc_open (filename, O_RDONLY | O_BINARY);
+    if (file == -1) {
         GString *errmsg = g_string_new(NULL);
         g_string_sprintf(errmsg, _(" Cannot open %s for reading "), filename);
         edit_error_dialog (_("Error"), get_sys_error (errmsg->str));
@@ -487 +488 @@
 edit_insert_file (WEdit *edit, const char *filename)
 {
     char *p;
-    if ((p = edit_get_filter (filename))) {
+    p = edit_get_filter (filename);
+    if (p) {
         FILE *f;
         long current = edit->curs1;
         f = (FILE *) popen (p, "r");
@@ -516 +518 @@
         long current = edit->curs1;
         int vertical_insertion = 0;
         char *buf;
-        if ((file = mc_open (filename, O_RDONLY | O_BINARY)) == -1)
+        file = mc_open (filename, O_RDONLY | O_BINARY);
+        if (file == -1)
             return 0;
         buf = g_malloc0 (TEMP_BUF_LEN);
         blocklen = mc_read (file, buf, sizeof(VERTICAL_MAGIC));
@@ -1105 +1108 @@
         return STACK_BOTTOM;
     }
     sp = (sp - 1) & edit->stack_size_mask;
-    if ((c = edit->undo_stack[sp]) >= 0) {
+    c = edit->undo_stack[sp];
+    if (c >= 0) {
 /*      edit->undo_stack[sp] = '@'; */
         edit->stack_pointer = (edit->stack_pointer - 1) & edit->stack_size_mask;
         return c;

edit/editcmd.c

@@ -267 +267 @@
         goto error_save;
 
 /* pipe save */
-    if ((p = edit_get_write_filter (savename, real_filename))) {
+    p = edit_get_write_filter (savename, real_filename);
+    if (p) {
         FILE *file;
 
         mc_close (fd);
@@ -565 +566 @@
             if (strcmp (edit->filename, exp)) {
                 int file;
                 different_filename = 1;
-                if ((file = mc_open (exp, O_RDONLY | O_BINARY)) != -1) {
+                file = mc_open (exp, O_RDONLY | O_BINARY);
+                if (file != -1) {
                     /* the file exists */
                     mc_close (file);
                     /* Overwrite the current file or cancel the operation */
@@ -648 +650 @@
     FILE *fd;
     int file;
     filename = concat_dir_and_file (home_dir, EDIT_MACRO_FILE);
-    if ((file = open (filename, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH)) == -1){
+    file = open (filename, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
+    if (file == -1) {
         g_free(filename);
         return 0;
     }
@@ -688 +691 @@
     (void) edit;
 
     if (saved_macros_loaded)
-        if ((j = macro_exists (k)) < 0)
+        j = macro_exists (k);
+        if (j < 0)
             return 0;
     tmp = concat_dir_and_file (home_dir, EDIT_TEMP_FILE);
     g = fopen (tmp , "w");
@@ -794 +798 @@
         if (macro_exists (k) < 0)
             return 0;
 
-    if ((f = edit_open_macro_file ("r"))) {
+    f = edit_open_macro_file ("r");
+    if (f) {
         struct macro dummy;
         do {
             int u;

edit/editlock.c

@@ -150 +150 @@
 {
     int cnt;
     static char buf[BUF_SIZE];
-
-    if ((cnt = readlink (lockfname, buf, BUF_SIZE - 1)) == -1 || !*buf)
+    cnt = readlink (lockfname, buf, BUF_SIZE - 1);
+    if (cnt == -1 || !(*buf))
         return NULL;
     buf[cnt] = '\0';
     return buf;

edit/syntax.c

@@ -146 +146 @@
     int argc;
 
     while (*argv && argv < argv_end) {
-        if ((t = g_tree_lookup (defines, *argv))) {
+        t = g_tree_lookup (defines, *argv);
+        if (t) {
             int count = 0;
 
             /* Count argv array members */
@@ -308 +309 @@
     int is_end;
     long end = 0;
     struct syntax_rule _rule = rule;
-
-    if (!(c = edit_get_byte (edit, i)))
+    c = edit_get_byte (edit, i);
+    if (!c)
         return rule;
     is_end = (rule.end == (unsigned char) i);
 
@@ -533 +534 @@
         r++;
         /* handle all of \r\n, \r, \n correctly. */
         if (c == '\r') {
-            if ( (c = fgetc (f)) == '\n')
+            c = fgetc (f);
+            if (c == '\n')
                 r++;
             else
                 ungetc (c, f);
@@ -927 +929 @@
 
             if (argc < 3)
                 break_a;
-            if ((argv = g_tree_lookup (edit->defines, key))) {
+            argv = g_tree_lookup (edit->defines, key);
+            if (argv) {
                 mc_defines_destroy (NULL, argv, NULL);
             } else {
                 key = g_strdup (key);
@@ -1066 +1069 @@
         if (!found && !strcmp (args[0], "include")) {
             if (g)
                 continue;
-            if (!args[1] || !(g = open_include_file (args[1]))) {
+            g = open_include_file (args[1]);
+            if (!args[1] || !g) {
                 result = line;
                 break;
             }

src/background.c

@@ -148 +148 @@
     if (pipe (back_comm) == -1)
         return -1;
 
-    if ((pid = fork ()) == -1) {
+    pid = fork ();
+    if (pid == -1) {
         int saved_errno = errno;
         (void) close (comm[0]);
         (void) close (comm[1]);
@@ -172 +173 @@
         close (1);
         close (2);
 
-        if ((nullfd = open ("/dev/null", O_RDWR)) != -1) {
+        nullfd = open ("/dev/null", O_RDWR);
+        if (nullfd != -1) {
             while (dup2 (nullfd, 0) == -1 && errno == EINTR);
             while (dup2 (nullfd, 1) == -1 && errno == EINTR);
             while (dup2 (nullfd, 2) == -1 && errno == EINTR);

src/charsets.c

@@ -57 +57 @@
     char *default_codepage = NULL;
 
     fname = concat_dir_and_file (mc_home, CHARSETS_INDEX);
-    if (!(f = fopen (fname, "r"))) {
+    f = fopen (fname, "r");
+    if (!f) {
         fprintf (stderr, _("Warning: file %s not found\n"), fname);
         g_free (fname);
 
         fname = concat_dir_and_file (mc_home_alt, CHARSETS_INDEX);
-        if (!(f = fopen (fname, "r"))) {
+        f = fopen (fname, "r");
+        if (!f) {
             fprintf (stderr, _("Warning: file %s not found\n"), fname);
             g_free (fname);
 

src/complete.c

@@ -564 +564 @@
     if (found == NULL) {
         g_free (path);
         path = NULL;
-    } else if ((p = strrchr (found, PATH_SEP)) != NULL) {
-        char *tmp = found;
-        found = strutils_shell_escape (p + 1);
-        g_free (tmp);
+    } else {
+        p = strrchr (found, PATH_SEP);
+        if (p != NULL) {
+            char *tmp = found;
+            found = strutils_shell_escape (p + 1);
+            g_free (tmp);
+        }
     }
 
     g_free(text);

src/file.c

@@ -1061 +1061 @@
 
     if (!ctx->do_append) {
         if (S_ISLNK (src_stats.st_mode) && ctx->stable_symlinks) {
-            if ((return_status = make_symlink (ctx, s, d)) == FILE_CONT) {
+            return_status = make_symlink (ctx, s, d);
+            if (return_status == FILE_CONT)
                 goto retry_src_remove;
-            } else
-                return return_status;
+            return return_status;
         }
 
         if (mc_rename (s, d) == 0) {

src/filenot.c

@@ -75 +75 @@
     q = vfs_canon (p);
     g_free (p);
 
-    if (!(result = my_mkdir_rec (q, mode)))
+    result = my_mkdir_rec (q, mode);
+    if (!result)
         result = mc_mkdir (s, mode);
 
     g_free (q);

src/hotlist.c

@@ -229 +229 @@
 do { \
     int               i; \
 \
-    if ((i = strlen (current->label) + 3) > buflen) { \
+    i = strlen (current->label) + 3; \
+    if (i > buflen) { \
       g_free (buf); \
       buf = g_malloc (buflen = 1024 * (i/1024 + 1)); \
     } \
@@ -1261 +1262 @@
     case '"':
         while ((c = getc (hotlist_file)) != EOF && c != '"') {
             if (c == '\\')
-                if ((c = getc (hotlist_file)) == EOF){
+                c = getc (hotlist_file);
+                if (c == EOF) {
                     g_string_free (tkn_buf, TRUE);
                     return TKN_EOF;
                 }
@@ -1273 +1275 @@
             ret = TKN_STRING;
         break;
     case '\\':
-        if ((c = getc (hotlist_file)) == EOF){
+        c = getc (hotlist_file);
+        if (c == EOF) {
             g_string_free (tkn_buf, TRUE);
             return TKN_EOF;
         }
@@ -1307 +1310 @@
 
 #define SKIP_TO_EOL     { \
 int _tkn; \
-while ((_tkn = hot_next_token ()) != TKN_EOF && _tkn != TKN_EOL) ; \
+_tkn = hot_next_token (); \
+while (_tkn != TKN_EOF && _tkn != TKN_EOL) ; \
+    _tkn = hot_next_token (); \
 }
 
 #define CHECK_TOKEN(_TKN_) \
-if ((tkn = hot_next_token ()) != _TKN_) { \
+tkn = hot_next_token (); \
+if (tkn != _TKN_) { \
     hotlist_state.readonly = 1; \
     hotlist_state.file_error = 1; \
     while (tkn != TKN_EOL && tkn != TKN_EOF) \
         tkn = hot_next_token (); \
-break; \
+    break; \
 }
 
 static void
@@ -1461 +1467 @@
      */
     hotlist->directory = g_strdup ("Hotlist");
 
-    if ((hotlist_file = fopen (hotlist_file_name, "r")) == 0) {
+    hotlist_file = fopen (hotlist_file_name, "r");
+    if (hotlist_file == 0) {
         int     result;
 
         load_group (hotlist);
@@ -1563 +1570 @@
     if (!hotlist_state.readonly && hotlist_state.modified && hotlist_file_name) {
         mc_util_make_backup_if_possible (hotlist_file_name, ".bak");
 
-        if ((hotlist_file = fopen (hotlist_file_name, "w")) != 0) {
+        hotlist_file = fopen (hotlist_file_name, "w");
+        if (hotlist_file != 0) {
             hot_save_group (hotlist);
             fclose (hotlist_file);
             stat (hotlist_file_name, &stat_buf);

src/logging.c

@@ -66 +66 @@
         if (is_logging_enabled()) {
                 va_start(args, fmt);
                 logfilename = g_strdup_printf("%s/%s/log", home_dir, MC_USERCONF_DIR);
-                if ((f = fopen(logfilename, "a")) != NULL) {
+                f = fopen(logfilename, "a");
+                if (f != NULL) {
                         (void)vfprintf(f, fmt, args);
                         (void)fclose(f);
                 }

src/main.c

@@ -434 +434 @@
 {
     const char *p;
     if (strlen (lwd) > strlen (cwd))
-        if ((p = strrchr (lwd, PATH_SEP)) && !strncmp (cwd, lwd, p - lwd) &&
+        p = strrchr (lwd, PATH_SEP);
+        if (p && !strncmp (cwd, lwd, p - lwd) &&
          ((gsize)strlen (cwd) == (gsize) p - (gsize) lwd || (p == lwd && cwd[0] == PATH_SEP &&
           cwd[1] == '\0'))) {
             return (p + 1);

src/mountlist.c

@@ -648 +648 @@
 
         if (!getcwd(dir, _POSIX_PATH_MAX)) return (NULL);
 
-        if ((fd = open(dir, O_RDONLY)) == -1) return (NULL);
+        fd = open(dir, O_RDONLY);
+        if (fd == -1) return (NULL);
 
         i = disk_get_entry(fd, &de);
 
@@ -746 +747 @@
         struct mount_entry      *entry;
     struct fs_usage             fs_use;
 
-        if ((entry = read_filesystem_list(0, 0)) != NULL)
+        entry = read_filesystem_list(0, 0);
+        if (entry != NULL)
         {
                 get_fs_usage(entry->me_mountdir, &fs_use);
 

src/pipethrough.c

@@ -393 +393 @@
                 goto cleanup;
         }
 
-        if ((pid = fork()) == (pid_t) -1) {
+        pid = fork();
+        if (pid == (pid_t) -1) {
                 propagate(&firsterror, errno);
                 goto cleanup;
         }

src/subshell.c

@@ -59 +59 @@
 #include "subshell.h"
 #include "strutil.h"
 #include "fileloc.h"
-
 #include "../vfs/vfs.h"
 
 #ifndef WEXITSTATUS
@@ -1187 +1186 @@
             pty_name [9] = *ptr2;
 
             /* Try to open master */
-            if ((pty_master = open (pty_name, O_RDWR)) == -1) {
+            pty_master = open (pty_name, O_RDWR);
+            if (pty_master == -1) {
                 if (errno == ENOENT)  /* Different from EIO */
                     return -1;        /* Out of pty devices */
                 else
@@ -1218 +1218 @@
         /* chown (pty_name, getuid (), group_info->gr_gid);  FIXME */
         /* chmod (pty_name, S_IRUSR | S_IWUSR | S_IWGRP);   FIXME */
     }
-    if ((pty_slave = open (pty_name, O_RDWR)) == -1)
+    pty_slave = open (pty_name, O_RDWR);
+    if (pty_slave == -1)
         fprintf (stderr, "open (pty_name, O_RDWR): %s\r\n", pty_name);
     fcntl(pty_slave, F_SETFD, FD_CLOEXEC);
     return pty_slave;

src/treestore.c

@@ -331 +331 @@
 
         if (vfs_file_is_local(current->name)) {
             /* Clear-text compression */
-            if (current->prev
-                && (common =
-                    str_common(current->prev->name, current->name)) > 2) {
+            common = str_common(current->prev->name, current->name);
+            if (current->prev && (common > 2)) {
                 char *encoded = encode(current->name + common);
 
                 i = fprintf(file, "%d:%d %s\n", current->scanned, common,
@@ -374 +373 @@
     name = g_build_filename (home_dir, MC_USERCONF_DIR, MC_TREESTORE_FILE, NULL);
     mc_util_make_backup_if_possible (name, ".tmp");
 
-    if ((retval = tree_store_save_to(name)) != 0) {
+    retval = tree_store_save_to(name);
+    if (retval != 0) {
         mc_util_restore_from_backup_if_possible (name, ".tmp");
         g_free(name);
         return retval;

src/user.c

@@ -782 +782 @@
         }
     }
 
-    if ((data = load_file (menu)) == NULL){
+    data = load_file (menu);
+    if (data == NULL) {
         message (D_ERROR, MSG_ERROR, _(" Cannot open file %s \n %s "),
                  menu, unix_error_string (errno));
         g_free (menu);

src/util.c

@@ -480 +480 @@
         char *q;
 
         if (has_prefix) {
-            if((q = strstr (p, prefixes[i].name)) == 0)
+            q = strstr (p, prefixes[i].name);
+            if (q == 0)
                continue;
             else
                 p = q + prefixes[i].len;
         }
 
-        if ((dir = strchr (p, PATH_SEP)) != NULL)
+        dir = strchr (p, PATH_SEP);
+        if (dir != NULL)
             *dir = '\0';
 
         /* search for any possible user */
@@ -569 +571 @@
     char *data;
     long read_size;
     
-    if ((data_file = fopen (filename, "r")) == NULL){
+    data_file = fopen (filename, "r");
+    if (data_file == NULL)
         return 0;
-    }
+
     if (fstat (fileno (data_file), &s) != 0){
         fclose (data_file);
         return 0;

src/utilunix.c

@@ -91 +91 @@
     char   *name;
     static int uid_last;
     
-    if ((name = i_cache_match (uid, uid_cache, UID_CACHE_SIZE)) != NULL)
+    name = i_cache_match (uid, uid_cache, UID_CACHE_SIZE);
+    if (name != NULL)
         return name;
     
     pwd = getpwuid (uid);
@@ -112 +113 @@
     char *name;
     static int  gid_last;
     
-    if ((name = i_cache_match (gid, gid_cache, GID_CACHE_SIZE)) != NULL)
+    name = i_cache_match (gid, gid_cache, GID_CACHE_SIZE);
+    if (name != NULL)
         return name;
     
     grp = getgrgid (gid);
@@ -150 +152 @@
     /* handler messing the screen after the SIGCONT */
     sigaction (SIGTSTP, &startup_handler, &save_stop);
 
-    if ((pid = fork ()) < 0){
+    pid = fork ();
+    if (pid < 0) {
         fprintf (stderr, "\n\nfork () = -1\n");
         return -1;
-    }
-    if (pid == 0){
+    } else if (pid == 0) {
         signal (SIGINT, SIG_DFL);
         signal (SIGQUIT, SIG_DFL);
         signal (SIGTSTP, SIG_DFL);

src/viewer/datasource.c

@@ -343 +343 @@
     mcview_close_datasource (view);
 
     open_error_pipe ();
-    if ((fp = popen (command, "r")) == NULL) {
+    fp = popen (command, "r");
+    if (fp == NULL) {
         /* Avoid two messages.  Message from stderr has priority.  */
         mcview_display (view);
         if (!close_error_pipe (mcview_is_in_panel (view) ? -1 : D_ERROR, NULL))

src/viewer/mcviewer.c

@@ -325 +325 @@
         retval = mcview_load_command_output (view, command);
     } else if (file != NULL && file[0] != '\0') {
         /* Open the file */
-        if ((fd = mc_open (file, O_RDONLY | O_NONBLOCK)) == -1) {
+        fd = mc_open (file, O_RDONLY | O_NONBLOCK);
+        if (fd == -1) {
             g_snprintf (tmp, sizeof (tmp), _(" Cannot open \"%s\"\n %s "),
                         file, unix_error_string (errno));
             mcview_show_error (view, tmp);

src/widget.c

@@ -1054 +1054 @@
 
     profile = g_build_filename (home_dir, MC_USERCONF_DIR, MC_HISTORY_FILE, NULL);
 
-    if ((i = open (profile, O_CREAT | O_EXCL, S_IRUSR | S_IWUSR)) != -1)
+    i = open (profile, O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
+    if (i != -1)
         close (i);
 
     /* Make sure the history is only readable by the user */

vfs/cpio.c

@@ -164 +164 @@
     mode_t mode;
     struct vfs_s_inode *root;
 
-    if ((fd = mc_open (name, O_RDONLY)) == -1) {
+    fd = mc_open (name, O_RDONLY);
+    if (fd == -1) {
         message (D_ERROR, MSG_ERROR, _("Cannot open cpio archive\n%s"), name);
         return -1;
     }
@@ -180 +181 @@
 
         mc_close (fd);
         s = g_strconcat (name, decompress_extension (type), (char *) NULL);
-        if ((fd = mc_open (s, O_RDONLY)) == -1) {
+        fd = mc_open (s, O_RDONLY);
+        if (fd == -1) {
             message (D_ERROR, MSG_ERROR, _("Cannot open cpio archive\n%s"), s);
             g_free (s);
             return -1;
@@ -246 +248 @@
                 ptr -= top - 128;
                 top = 128;
             }
-            if((tmp = mc_read(super->u.arch.fd, buf, top)) == 0 || tmp == -1) {
+            tmp = mc_read(super->u.arch.fd, buf, top);
+            if (tmp == 0 || tmp == -1) {
                 message (D_ERROR, MSG_ERROR, _("Premature end of cpio archive\n%s"), super->name);
                 cpio_free_archive(me, super);
                 return CPIO_UNKNOWN;
@@ -418 +421 @@
     char *name;
     struct stat st;
 
-    if((len = mc_read(super->u.arch.fd, (char *)&u.buf, HEAD_LENGTH)) < HEAD_LENGTH)
+    len = mc_read(super->u.arch.fd, (char *)&u.buf, HEAD_LENGTH);
+    if (len < HEAD_LENGTH)
         return STATUS_EOF;
     CPIO_POS(super) += len;
     if(super->u.arch.type == CPIO_BINRE) {
@@ -434 +438 @@
         return STATUS_FAIL;
     }
     name = g_malloc(u.buf.c_namesize);
-    if((len = mc_read(super->u.arch.fd, name, u.buf.c_namesize)) < u.buf.c_namesize) {
+    len = mc_read(super->u.arch.fd, name, u.buf.c_namesize);
+    if (len < u.buf.c_namesize) {
         g_free(name);
         return STATUS_EOF;
     }
@@ -492 +497 @@
         return STATUS_FAIL;
     }
     name = g_malloc(hd.c_namesize);
-    if((len = mc_read(super->u.arch.fd, name, hd.c_namesize)) == -1 ||
-       (unsigned long) len < hd.c_namesize) {
+    len = mc_read(super->u.arch.fd, name, hd.c_namesize);
+    if ((len == -1) || ((unsigned long) len < hd.c_namesize)) {
         g_free (name);
         return STATUS_EOF;
     }
@@ -668 +673 @@
 
     count = MIN(count, FH->ino->st.st_size - FH->pos);
 
-    if ((count = mc_read (fd, buffer, count)) == -1) ERRNOR (errno, -1);
+    count = mc_read (fd, buffer, count);
+    if (count == -1) ERRNOR (errno, -1);
 
     FH->pos += count;
     return count;

vfs/direntry.c

@@ -483 +483 @@
     vfs_split (inname, &local, &op);
     retval = (local) ? local : "";
 
-    if (MEDATA->archive_check)
-        if (!(cookie = MEDATA->archive_check (me, archive_name, op)))
+    if (MEDATA->archive_check) {
+        cookie = MEDATA->archive_check (me, archive_name, op);
+        if (!cookie)
             return NULL;
+    }
 
     for (super = MEDATA->supers; super != NULL; super = super->next) {
         /* 0 == other, 1 == same, return it, 2 == other but stop scanning */
@@ -585 +587 @@
     struct vfs_s_inode *ino;
     char *q;
 
-    if (!(q = vfs_s_get_path (me, name, &super, 0)))
+    q = vfs_s_get_path (me, name, &super, 0);
+    if (!q)
         return NULL;
 
     ino =
@@ -668 +671 @@
 vfs_s_chdir (struct vfs_class *me, const char *path)
 {
     void *data;
-    if (!(data = vfs_s_opendir (me, path)))
+    data = vfs_s_opendir (me, path);
+    if (!data)
         return -1;
     vfs_s_closedir (data);
     return 0;
@@ -681 +685 @@
 {
     struct vfs_s_inode *ino;
 
-    if (!(ino = vfs_s_inode_from_path (me, path, flag)))
+    ino = vfs_s_inode_from_path (me, path, flag);
+    if (!ino)
         return -1;
     *buf = ino->st;
     return 0;
@@ -739 +744 @@
     char *q;
     struct vfs_s_inode *ino;
 
-    if ((q = vfs_s_get_path (me, file, &super, 0)) == NULL)
+    q = vfs_s_get_path (me, file, &super, 0);
+    if (q == NULL)
         return NULL;
     ino = vfs_s_find_inode (me, super, q, LINK_FOLLOW, FL_NONE);
     if (ino && ((flags & (O_CREAT | O_EXCL)) == (O_CREAT | O_EXCL))) {
@@ -1103 +1109 @@
     struct vfs_s_super *archive;
     char *p;
 
-    if (!(p = vfs_s_get_path (me, path, &archive, FL_NO_OPEN)))
+    p = vfs_s_get_path (me, path, &archive, FL_NO_OPEN);
+    if (!p)
         return NULL;
     g_free(p);
     return (vfsid) archive;    

vfs/extfs.c

@@ -323 +323 @@
     struct archive *current_archive;
     char *current_file_name, *current_link_name;
 
-    if ((extfsd =
-         extfs_open_archive (fstype, name, &current_archive)) == NULL) {
+    extfsd = extfs_open_archive (fstype, name, &current_archive);
+    if (extfsd == NULL) {
         message (D_ERROR, MSG_ERROR, _("Cannot open %s archive\n%s"),
                  extfs_prefixes[fstype], name);
         return -1;
@@ -655 +655 @@
     char *p, *q, *archive_name, *mc_extfsdir;
     char *cmd;
 
-    if ((p = extfs_get_path (me, file, &archive, 0)) == NULL)
+    p = extfs_get_path (me, file, &archive, 0);
+    if (p == NULL)
         return;
     q = name_quote (p, 0);
     g_free (p);
@@ -681 +682 @@
     int local_handle;
     int created = 0;
 
-    if ((q = extfs_get_path (me, file, &archive, 0)) == NULL)
+    q = extfs_get_path (me, file, &archive, 0);
+    if (q == NULL)
         return NULL;
     entry = extfs_find_entry (archive->root_entry, q, 0, 0);
     if (entry == NULL && (flags & O_CREAT)) {
@@ -693 +695 @@
     g_free (q);
     if (entry == NULL)
         return NULL;
-    if ((entry = extfs_resolve_symlinks (entry)) == NULL)
+    entry = extfs_resolve_symlinks (entry);
+    if (entry == NULL)
         return NULL;
 
     if (S_ISDIR (entry->inode->mode))
@@ -817 +820 @@
             if (!strcmp (p, "..")) 
                 pent = pent->dir;
             else {
-                if ((pent = extfs_resolve_symlinks_int (pent, list))==NULL){
+                pent = extfs_resolve_symlinks_int (pent, list);
+                if (pent == NULL) {
                     *q = c;
                     return NULL;
                 }
@@ -893 +897 @@
     struct entry *entry;
     struct entry **info;
 
-    if ((q = extfs_get_path (me, dirname, &archive, 0)) == NULL)
+    q = extfs_get_path (me, dirname, &archive, 0);
+    if (q == NULL)
         return NULL;
     entry = extfs_find_entry (archive->root_entry, q, 0, 0);
     g_free (q);
     if (entry == NULL)
         return NULL;
-    if ((entry = extfs_resolve_symlinks (entry)) == NULL)
+    entry = extfs_resolve_symlinks (entry);
+    if (entry == NULL)
         return NULL;
     if (!S_ISDIR (entry->inode->mode)) ERRNOR (ENOTDIR, NULL);
 
@@ -965 +971 @@
     char *path2 = g_strdup (path);
     int result = -1;
 
-    if ((q = extfs_get_path_mangle (me, path2, &archive, 0)) == NULL)
+    q = extfs_get_path_mangle (me, path2, &archive, 0);
+    if (q == NULL)
         goto cleanup;
     entry = extfs_find_entry (archive->root_entry, q, 0, 0);
     if (entry == NULL)
         goto cleanup;
-    if (resolve && (entry = extfs_resolve_symlinks (entry)) == NULL)
+    entry = extfs_resolve_symlinks (entry);
+    if (resolve && (entry == NULL))
         goto cleanup;
     extfs_stat_move (buf, entry->inode);
     result = 0;
@@ -1007 +1015 @@
     char *mpath = g_strdup (path);
     int result = -1;
 
-    if ((q = extfs_get_path_mangle (me, mpath, &archive, 0)) == NULL)
+    q = extfs_get_path_mangle (me, mpath, &archive, 0);
+    if (q == NULL)
         goto cleanup;
     entry = extfs_find_entry (archive->root_entry, q, 0, 0);
     if (entry == NULL)
@@ -1058 +1067 @@
     struct entry *entry;
     int result = -1;
 
-    if ((q = extfs_get_path_mangle (me, mpath, &archive, 0)) == NULL)
+    q = extfs_get_path_mangle (me, mpath, &archive, 0);
+    if (q == NULL)
         goto cleanup;
     entry = extfs_find_entry (archive->root_entry, q, 0, 0);
     if (entry == NULL)
         goto cleanup;
-    if ((entry = extfs_resolve_symlinks (entry)) == NULL)
+    entry = extfs_resolve_symlinks (entry);
+    if (entry == NULL)
         goto cleanup;
     if (S_ISDIR (entry->inode->mode)) {
         me->verrno = EISDIR;
@@ -1089 +1100 @@
 
     (void) mode;
 
-    if ((q = extfs_get_path_mangle (me, mpath, &archive, 0)) == NULL)
+    q = extfs_get_path_mangle (me, mpath, &archive, 0);
+    if (q == NULL)
         goto cleanup;
     entry = extfs_find_entry (archive->root_entry, q, 0, 0);
     if (entry != NULL) {
@@ -1099 +1111 @@
     entry = extfs_find_entry (archive->root_entry, q, 1, 0);
     if (entry == NULL)
         goto cleanup;
-    if ((entry = extfs_resolve_symlinks (entry)) == NULL)
+    entry = extfs_resolve_symlinks (entry);
+    if (entry == NULL)
         goto cleanup;
     if (!S_ISDIR (entry->inode->mode)) {
         me->verrno = ENOTDIR;
@@ -1124 +1137 @@
     struct entry *entry;
     int result = -1;
 
-    if ((q = extfs_get_path_mangle (me, mpath, &archive, 0)) == NULL)
+    q = extfs_get_path_mangle (me, mpath, &archive, 0);
+    if (q == NULL)
         goto cleanup;
     entry = extfs_find_entry (archive->root_entry, q, 0, 0);
     if (entry == NULL)
         goto cleanup;
-    if ((entry = extfs_resolve_symlinks (entry)) == NULL)
+    entry = extfs_resolve_symlinks (entry);
+    if (entry == NULL)
         goto cleanup;
     if (!S_ISDIR (entry->inode->mode)) {
         me->verrno = ENOTDIR;
@@ -1155 +1170 @@
     struct entry *entry;
 
     my_errno = ENOTDIR;
-    if ((q = extfs_get_path (me, path, &archive, 0)) == NULL)
+    q = extfs_get_path (me, path, &archive, 0);
+    if (q == NULL)
         return -1;
     entry = extfs_find_entry (archive->root_entry, q, 0, 0);
     g_free (q);
@@ -1352 +1368 @@
         if (*key == '#' || *key == '\n')
             continue;
 
-        if ((c = strchr (key, '\n'))){
+        c = strchr (key, '\n');
+        if (c) {
             *c-- = 0;
         } else {        /* Last line without newline or strlen (key) > 255 */
             c = &key [strlen (key) - 1];

vfs/fish.c

@@ -199 +199 @@
     if ((pipe(fileset1)<0) || (pipe(fileset2)<0)) 
         vfs_die("Cannot pipe(): %m.");
     
-    if ((res = fork())) {
+    res = fork();
+    if (res) {
         if (res<0) vfs_die("Cannot fork(): %m.");
         /* We are the parent */
         close(fileset1[0]);
@@ -787 +788 @@
         }
         if (n == 0)
             break;
-        if ((t = write (SUP.sockw, buffer, n)) != n) {
+        t = write (SUP.sockw, buffer, n);
+        if (t != n) {
             if (t == -1) {
                 me->verrno = errno;
             } else { 
@@ -873 +875 @@
     do {
         n = MIN(8192, fh->u.fish.total - fh->u.fish.got);
         if (n) {
-            if ((n = read(SUP.sockr, buffer, n)) < 0)
+            n = read(SUP.sockr, buffer, n);
+            if (n < 0)
                 return;
             fh->u.fish.got += n;
         }
@@ -960 +963 @@
     const char *crpath; \
     char *rpath, *mpath = g_strdup (path); \
     struct vfs_s_super *super; \
-    if (!(crpath = vfs_s_get_path_mangle (me, mpath, &super, 0))) { \
+    crpath = vfs_s_get_path_mangle (me, mpath, &super, 0); \
+    if (!crpath) { \
         g_free (mpath); \
         return -1; \
     } \
@@ -993 +997 @@
     const char *crpath1, *crpath2; \
     char *rpath1, *rpath2, *mpath1, *mpath2; \
     struct vfs_s_super *super1, *super2; \
-    if (!(crpath1 = vfs_s_get_path_mangle (me, mpath1 = g_strdup(path1), &super1, 0))) { \
+    crpath1 = vfs_s_get_path_mangle (me, mpath1 = g_strdup(path1), &super1, 0); \
+    if (!crpath1) { \
         g_free (mpath1); \
         return -1; \
     } \
-    if (!(crpath2 = vfs_s_get_path_mangle (me, mpath2 = g_strdup(path2), &super2, 0))) { \
+    crpath2 = vfs_s_get_path_mangle (me, mpath2 = g_strdup(path2), &super2, 0); \
+    if (!crpath2) { \
         g_free (mpath1); \
         g_free (mpath2); \
         return -1; \
@@ -1049 +1055 @@
     struct passwd *pw;
     struct group *gr;
 
-    if ((pw = getpwuid (owner)) == NULL)
+    pw = getpwuid (owner);
+    if (pw == NULL)
         return 0;
 
-    if ((gr = getgrgid (group)) == NULL)
+    gr = getgrgid (group);
+    if (gr == NULL)
         return 0;
 
     sowner = pw->pw_name;

vfs/ftpfs.c

@@ -218 +218 @@
         ret = g_strdup (remote_path);
 
         /* replace first occurance of ":/" with ":" */
-        if ((p = strchr (ret, ':')) && *(p + 1) == '/')
+        p = strchr (ret, ':');
+        if (p && (*(p + 1) == '/'))
             strcpy (p + 1, p + 2);
 
         /* strip trailing "/." */
-        if ((p = strrchr (ret, '/')) && *(p + 1) == '.' && *(p + 2) == '\0')
+        p = strrchr (ret, '/');
+        if (p && (*(p + 1) == '.') && (*(p + 2) == '\0'))
             *p = '\0';
         return ret;
     }
@@ -579 +581 @@
         return;
 
     mc_file = concat_dir_and_file (mc_home, "mc.no_proxy");
-    if (exist_file (mc_file) &&
-        (npf = fopen (mc_file, "r"))) {
-        while (fgets (s, sizeof (s), npf)) {
-            if (!(p = strchr (s, '\n'))) {      /* skip bogus entries */ 
-                while ((c = fgetc (npf)) != EOF && c != '\n')
-                    ;
-                continue;
-            }
-
-            if (p == s)
-                continue;
-
-            *p = '\0';
-            
-            np = g_new (struct no_proxy_entry, 1);
-            np->domain = g_strdup (s);
-            np->next   = NULL;
-            if (no_proxy)
-                current->next = np;
-            else
-                no_proxy = np;
-            current = np;
+    if (exist_file (mc_file)) {
+        npf = fopen (mc_file, "r");
+        if (npf) {
+            while (fgets (s, sizeof (s), npf)) {
+                p = strchr (s, '\n');
+                if (!p) {       /* skip bogus entries */
+                    while ((c = fgetc (npf)) != EOF && c != '\n')
+                        ;
+                    continue;
+                }
+
+                if (p == s)
+                    continue;
+
+                *p = '\0';
+
+                np = g_new (struct no_proxy_entry, 1);
+                np->domain = g_strdup (s);
+                np->next   = NULL;
+                if (no_proxy)
+                    current->next = np;
+                else
+                    no_proxy = np;
+                current = np;
+            }
+
+            fclose (npf);
         }
-
-        fclose (npf);
     }
     g_free (mc_file);
 }
@@ -1091 +1096 @@
     int s, j, data;
     socklen_t fromlen = sizeof(from);
     
-    if ((s = ftpfs_initconn (me, super)) == -1)
+    s = ftpfs_initconn (me, super);
+    if (s == -1)
         return -1;
     if (ftpfs_changetype (me, super, isbinary) == -1)
         return -1;
@@ -1620 +1626 @@
     int r;
     int flush_directory_cache = (flags & OPT_FLUSH);
 
-    if (!(rpath = vfs_s_get_path_mangle(me, mpath, &super, 0))) {
+    rpath = vfs_s_get_path_mangle(me, mpath, &super, 0);
+    if (!rpath) {
         g_free(mpath);
         return -1;
     }
@@ -2043 +2050 @@
     /* Find our own domain name */
     if (gethostname (hostname, sizeof (hostname)) < 0)
         *hostname = 0;
-    if (!(domain = strchr (hostname, '.')))
+    domain = strchr (hostname, '.');
+    if (!domain)
         domain = "";
 
     /* Scan for "default" and matching "machine" keywords */

vfs/mcfs.c

@@ -212 +212 @@
 #ifdef HAVE_PMAP_GETPORT
     int port;
     for (*version = RPC_PROGVER; *version >= 1; (*version)--)
-        if (port = pmap_getport (sin, RPC_PROGNUM, *version, IPPROTO_TCP))
+        port = pmap_getport (sin, RPC_PROGNUM, *version, IPPROTO_TCP);
+        if (port)
             return port;
 #endif                          /* HAVE_PMAP_GETPORT */
     *version = 1;
@@ -237 +238 @@
     server_address.sin_family = AF_INET;
 
     /*  Try to use the dotted decimal number */
-    if ((inaddr = inet_addr (host)) != INADDR_NONE)
+    inaddr = inet_addr (host);
+    if (inaddr != INADDR_NONE)
         memcpy ((char *) &server_address.sin_addr, (char *) &inaddr,
                 sizeof (inaddr));
     else {
-        if ((hp = gethostbyname (host)) == NULL) {
+        hp = gethostbyname (host);
+        if (hp == NULL) {
             message (D_ERROR, caller, _(" Cannot locate hostname: %s "),
                         host);
             return 0;
@@ -260 +263 @@
 
     server_address.sin_port = htons (*port);
 
-    if ((my_socket = socket (AF_INET, SOCK_STREAM, 0)) < 0) {
+    my_socket = socket (AF_INET, SOCK_STREAM, 0);
+    if (my_socket < 0) {
         message (D_ERROR, caller, _(" Cannot create socket: %s "),
                     unix_error_string (errno));
         return 0;
@@ -341 +345 @@
         return 0;
     }
 
-    if (!
-        (sock =
-         mcfs_open_tcp_link (host, user, port, netrcpass, &version)))
+    sock = mcfs_open_tcp_link (host, user, port, netrcpass, &version);
+    if (!sock)
         return 0;
 
     bucket = mcfs_get_free_bucket ();
@@ -394 +397 @@
      * remote portmapper to get the port number
      */
     port = 0;
-    if ((remote_path =
-         mcfs_get_host_and_username (path, &host, &user, &port, &pass)))
-        if (!(*mc = mcfs_open_link (host, user, &port, pass))) {
+    remote_path = mcfs_get_host_and_username (path, &host, &user, &port, &pass);
+    if (remote_path) {
+        *mc = mcfs_open_link (host, user, &port, pass);
+        if (!(*mc)) {
             g_free (remote_path);
             remote_path = NULL;
         }
+    }
     g_free (host);
     g_free (user);
     if (pass)
@@ -445 +450 @@
     mcfs_connection *mc;
     char *r1, *r2;
 
-    if ((r1 = mcfs_get_path (&mc, s1)) == 0)
+    r1 = mcfs_get_path (&mc, s1);
+    if (r1 == 0)
         return -1;
 
-    if ((r2 = mcfs_get_path (&mc, s2)) == 0) {
+    r2 = mcfs_get_path (&mc, s2);
+    if (r2 == 0) {
         g_free (r1);
         return -1;
     }
@@ -466 +473 @@
     mcfs_connection *mc;
     char *remote_file;
 
-    if ((remote_file = mcfs_get_path (&mc, path)) == 0)
+    remote_file = mcfs_get_path (&mc, path);
+    if (remote_file == 0)
         return -1;
 
     rpc_send (mc->sock,
@@ -482 +490 @@
     mcfs_connection *mc;
     char *remote_file;
 
-    if ((remote_file = mcfs_get_path (&mc, path)) == 0)
+    remote_file = mcfs_get_path (&mc, path);
+    if (remote_file == 0)
         return -1;
 
     rpc_send (mc->sock,
@@ -499 +508 @@
     mcfs_connection *mc;
     char *remote_file;
 
-    if ((remote_file = mcfs_get_path (&mc, path)) == 0)
+    remote_file = mcfs_get_path (&mc, path);
+    if (remote_file == 0)
         return -1;
 
     rpc_send (mc->sock,
@@ -537 +547 @@
 
     (void) me;
 
-    if (!(remote_file = mcfs_get_path (&mc, file)))
+    remote_file = mcfs_get_path (&mc, file);
+    if (!remote_file)
         return 0;
 
     rpc_send (mc->sock, RPC_INT, MC_OPEN, RPC_STRING, remote_file, RPC_INT,
@@ -661 +672 @@
 
     (void) me;
 
-    if (!(remote_dir = mcfs_get_path (&mc, dirname)))
+    remote_dir = mcfs_get_path (&mc, dirname);
+    if (!remote_dir)
         return 0;
 
     rpc_send (mc->sock, RPC_INT, MC_OPENDIR, RPC_STRING, remote_dir,
@@ -880 +892 @@
     mcfs_connection *mc;
     int status, error;
 
-    if ((remote_file = mcfs_get_path (&mc, path)) == 0)
+    remote_file = mcfs_get_path (&mc, path);
+    if (remote_file == 0)
         return -1;
 
     rpc_send (mc->sock, RPC_INT, cmd, RPC_STRING, remote_file, RPC_END);
@@ -970 +983 @@
 
     (void) me;
 
-    if (!(file = mcfs_get_path (&mc, path)))
+    file = mcfs_get_path (&mc, path);
+    if (!file)
         return -1;
 
     status = 0;
@@ -1005 +1019 @@
 
     (void) me;
 
-    if (!(remote_file = mcfs_get_path (&mc, path)))
+    remote_file = mcfs_get_path (&mc, path);
+    if (!remote_file)
         return -1;
 
     rpc_send (mc->sock, RPC_INT, MC_READLINK, RPC_STRING, remote_file,
@@ -1062 +1077 @@
 
     (void) me;
 
-    if (!(remote_dir = mcfs_get_path (&mc, path)))
+    remote_dir = mcfs_get_path (&mc, path);
+    if (!remote_dir)
         return -1;
 
     rpc_send (mc->sock, RPC_INT, MC_CHDIR, RPC_STRING, remote_dir,
@@ -1140 +1156 @@
     if (path[0] == '/' && path[1] == '/')
         path += 2;
 
-    if ((p =
-         mcfs_get_host_and_username (path, &host, &user, &port,
-                                     &pass)) == 0) {
+    p = mcfs_get_host_and_username (path, &host, &user, &port, &pass);
+    if (p == 0) {
         g_free (host);
         g_free (user);
         if (pass)

vfs/mcserv.c

@@ -798 +798 @@
     up.password = password;
     conv.appdata_ptr = &up;
 
-    if ((status =
-         pam_start ("mcserv", username, &conv, &pamh)) != PAM_SUCCESS)
+    status = pam_start ("mcserv", username, &conv, &pamh);
+    if (status != PAM_SUCCESS)
         goto failed_pam;
-    if ((status = pam_authenticate (pamh, 0)) != PAM_SUCCESS)
+    status = pam_authenticate (pamh, 0);
+    if (status != PAM_SUCCESS)
         goto failed_pam;
-    if ((status = pam_acct_mgmt (pamh, 0)) != PAM_SUCCESS)
+    status = pam_acct_mgmt (pamh, 0);
+    if (status != PAM_SUCCESS)
         goto failed_pam;
-    if ((status = pam_setcred (pamh, PAM_ESTABLISH_CRED)) != PAM_SUCCESS)
+    status = pam_setcred (pamh, PAM_ESTABLISH_CRED);
+    if (status != PAM_SUCCESS)
         goto failed_pam;
     pam_end (pamh, status);
     return 0;
@@ -865 +868 @@
     local_address.sin_port = htons (21);
 
     /*  Convert localhost to usable format */
-    if ((inaddr = inet_addr ("127.0.0.1")) != INADDR_NONE)
+    inaddr = inet_addr ("127.0.0.1");
+    if (inaddr != INADDR_NONE)
         memcpy ((char *) &local_address.sin_addr, (char *) &inaddr,
                 sizeof (inaddr));
 
-    if ((my_socket = socket (AF_INET, SOCK_STREAM, 0)) < 0) {
+    my_socket = socket (AF_INET, SOCK_STREAM, 0);
+    if (my_socket < 0) {
         if (!isDaemon)
             fprintf (stderr, "do_auth: can't create socket\n");
         return 0;
@@ -915 +920 @@
     struct spwd *spw;
 #endif
 
-    if ((pw = getpwnam (username)) == 0)
+    pw = getpwnam (username);
+    if (pw == 0)
         return 0;
 
 #ifdef HAVE_SHADOW
     setspent ();
 
     /* Password expiration is not checked! */
-    if ((spw = getspnam (username)) == NULL)
+    spw = getspnam (username);
+    if (spw == NULL)
         encr_pwd = "*";
     else
         encr_pwd = spw->sp_pwdp;
@@ -1197 +1204 @@
     struct sockaddr_in client_address, server_address;
     int yes = 1;
 
-    if ((sock = socket (AF_INET, SOCK_STREAM, 0)) < 0)
+    sock = socket (AF_INET, SOCK_STREAM, 0);
+    if (sock < 0)
         return "Cannot create socket";
 
     /* Use this to debug: */
@@ -1224 +1232 @@
         newsocket =
             accept (sock, (struct sockaddr *) &client_address, &clilen);
 
-        if (isDaemon && (child = fork ())) {
+        child = fork ();
+        if (isDaemon && child) {
             int status;
 
             close (newsocket);
@@ -1296 +1305 @@
             exit (1);
     }
 #else
-    (void) port;
     if (abort_if_fail) {
         fprintf (stderr,
                  "This system lacks port registration, try using the -p\n"
@@ -1370 +1378 @@
         register_port (portnum, 0);
         if (verbose)
             printf ("Using port %d\n", portnum);
-        if ((result = get_client (portnum)))
+        result = get_client (portnum);
+        if (result)
             perror (result);
 #ifdef HAVE_PMAP_SET
         if (!isDaemon)

vfs/sfs.c

@@ -84 +84 @@
 
     pname = g_strdup (name);
     vfs_split (pname, &inpath, &op);
-    if ((w = (*me->which) (me, op)) == -1)
+
+    w = (*me->which) (me, op);
+    if (w == -1)
         vfs_die ("This cannot happen... Hopefully.\n");
 
     if (!(sfs_flags[w] & F_1) && strcmp (pname, "/")) {
@@ -394 +396 @@
             goto invalid_line;
         c++;
         *(semi+1) = 0;
-        if ((semi = strchr (c, '\n')))
+        semi = strchr (c, '\n');
+        if (semi)
             *semi = 0;
 
         sfs_prefix [sfs_no] = g_strdup (key);

vfs/tar.c

@@ -665 +665 @@
 
     current_tar_position = 0;
     /* Open for reading */
-    if ((tard = tar_open_archive_int (me, name, archive)) == -1)
+    tard = tar_open_archive_int (me, name, archive);
+    if (tard == -1)
         return -1;
 
     for (;;) {
@@ -771 +772 @@
 
     count = MIN(count, FH->ino->st.st_size - FH->pos);
 
-    if ((count = mc_read (fd, buffer, count)) == -1) ERRNOR (errno, -1);
+    count = mc_read (fd, buffer, count);
+    if (count == -1) ERRNOR (errno, -1);
 
     FH->pos += count;
     return count;

vfs/undelfs.c

@@ -200 +200 @@
         message (D_ERROR, undelfserr, _(" while allocating block buffer "));
         goto free_delarray;
     }
-    if ((retval = ext2fs_open_inode_scan (fs, 0, &scan))) {
+    retval = ext2fs_open_inode_scan (fs, 0, &scan);
+    if (retval) {
         message (D_ERROR, undelfserr, _(" open_inode_scan: %d "), retval);
         goto free_block_buf;
     }
-    if ((retval = ext2fs_get_next_inode (scan, &ino, &inode))) {
+    retval = ext2fs_get_next_inode (scan, &ino, &inode);
+    if (retval) {
         message (D_ERROR, undelfserr, _(" while starting inode scan %d "),
                  retval);
         goto error_out;
@@ -640 +642 @@
     /* We may use access because ext2 file systems are local */
     /* this could be fixed by making an ext2fs io manager to use */
     /* our vfs, but that is left as an excercise for the reader */
-    if ((fd = open (file, O_RDONLY)) == -1){
+    fd = open (file, O_RDONLY);
+    if (fd == -1) {
         message (D_ERROR, undelfserr, _(" Cannot open file %s "), file);
         g_free (f);
         g_free (file);

vfs/utilvfs.c

@@ -355 +355 @@
     if (!str)
         return 0;
 
-    if ((pos = strstr (week, str)) != NULL) {
+    pos = strstr (week, str);
+    if (pos != NULL) {
         if (tim != NULL)
             tim->tm_wday = (pos - week) / 3;
         return 1;
@@ -372 +373 @@
     if (!str)
         return 0;
 
-    if ((pos = strstr (month, str)) != NULL) {
+    pos = strstr (month, str);
+    if (pos != NULL) {
         if (tim != NULL)
             tim->tm_mon = (pos - month) / 3;
         return 1;
@@ -412 +414 @@
     if (!str)
         return 0;
 
-    if ((p = strchr (str, ':')) && (p2 = strrchr (str, ':'))) {
+    p = strchr (str, ':');
+    p2 = strrchr (str, ':');
+    if (p && p2) {
         if (p != p2) {
             if (sscanf
                 (str, "%2d:%2d:%2d", &tim->tm_hour, &tim->tm_min,
@@ -741 +745 @@
 
         tim.tm_year--;
 
-    if (l10n || (*t = mktime (&tim)) < 0)
+    *t = mktime (&tim);
+    if (l10n || (*t < 0))
         *t = 0;
     return idx;
 }

vfs/vfs.c

@@ -233 +233 @@
         vfs_die ("vfs_strip_suffix_from_path got NULL: impossible");
 
     p = g_strdup (filename);
-    if (!(semi = strrchr (p, '#')))
+    semi = strrchr (p, '#');
+    if (!semi)
         return p;
 
     /* Avoid last class (localfs) that would accept any prefix */
@@ -306 +307 @@
     if (slash)
         *slash = 0;
 
-    if ((ret = vfs_prefix_to_class (semi+1))){
+    ret = vfs_prefix_to_class (semi + 1);
+    if (ret) {
         if (op) 
             *op = semi + 1;
         if (inpath)