Not checking for non-NULL before freeing a variable, as it's unnecessary.

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5249 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index d2ea86b151c749be55878d2a1c3866925d1441a9..ed47f60881e05aa4f26dc0b91f5d725902d7bbf7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@
        * src/winio.c (edit_draw): When the whole line has been coloured,
        don't bother looking for any more starts.  This prevents some lines
        from being erroneously marked as CENDAFTER instead of CWHOLELINE.
+       * src/*.c: Don't check for non-NULL before freeing; it's unneeded.
 
 2015-06-11  Benno Schulenberg  <bensberg@justemail.net>
        * src/winio.c (get_key_buffer): Add some debugging code to make it

diff --git a/src/browser.c b/src/browser.c
index ad59baf8bd17e3acca8d6b805e7744d83a6884dd..98beef1edc4559f8b023d788e6825df552844861 100644 (file)
--- a/src/browser.c
+++ b/src/browser.c
@@ -405,8 +405,7 @@ char *do_browse_from(const char *inpath)
 
     /* If we can't open the path, get out. */
     if (dir == NULL) {
-       if (path != NULL)
-           free(path);
+       free(path);
        beep();
        return NULL;
     }

diff --git a/src/color.c b/src/color.c
index cae9c2a8394eeb9b91089aea0acd04e83f65be05..3c33aa7e81374df254262fa8cccafa50432adaaa 100644 (file)
--- a/src/color.c
+++ b/src/color.c
@@ -70,10 +70,8 @@ void set_colorpairs(void)
                interface_color_pair[i].pairnum = A_NORMAL;
        }
 
-       if (specified_color_combo[i] != NULL) {
-           free(specified_color_combo[i]);
-           specified_color_combo[i] = NULL;
-       }
+       free(specified_color_combo[i]);
+       specified_color_combo[i] = NULL;
     }
 
     for (; this_syntax != NULL; this_syntax = this_syntax->next) {

diff --git a/src/files.c b/src/files.c
index 445501856d455df2e8e35b94b0cc801294eea119..3b5797876a88f055061ae91d295010a6883a0e6c 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -830,10 +830,8 @@ void read_file(FILE *f, int fd, const char *filename, bool undoable, bool checkw
            /* Move fileptr back one line and blow away the old fileptr,
             * since its text has been saved. */
            fileptr = fileptr->prev;
-           if (fileptr != NULL) {
-               if (fileptr->next != NULL)
-                   free(fileptr->next);
-           }
+           if (fileptr != NULL)
+               free(fileptr->next);
        }
 
        /* Attach the line at current after the line at fileptr. */
@@ -1454,8 +1452,7 @@ char *get_full_path(const char *origpath)
     }
 
     /* Free d_there_file, since we're done using it. */
-    if (d_there_file != NULL)
-       free(d_there_file);
+    free(d_there_file);
 
     return d_there;
 }
@@ -2177,8 +2174,7 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type
 
   cleanup_and_exit:
     free(realname);
-    if (tempname != NULL)
-       free(tempname);
+    free(tempname);
 
     return retval;
 }
@@ -2401,10 +2397,8 @@ bool do_writeout(bool exiting)
                 * string's real length. */
                unsunder(answer, answer_len);
 
-               if (full_filename != NULL)
-                   free(full_filename);
-               if (full_answer != NULL)
-                   free(full_answer);
+               free(full_filename);
+               free(full_answer);
 
                if (do_warning) {
                    /* If we're using restricted mode, we aren't allowed

diff --git a/src/global.c b/src/global.c
index 614e46d6cef4f862e64c7cefb16066b156b43644..f1477308672f63115b80211270b2be37ff46fe58 100644 (file)
--- a/src/global.c
+++ b/src/global.c
@@ -1580,32 +1580,25 @@ void thanks_for_all_the_fish(void)
     delwin(bottomwin);
 
 #ifndef DISABLE_JUSTIFY
-    if (quotestr != NULL)
-       free(quotestr);
+    free(quotestr);
 #ifdef HAVE_REGEX_H
     regfree(&quotereg);
-    if (quoteerr != NULL)
-       free(quoteerr);
+    free(quoteerr);
 #endif
 #endif
 #ifndef NANO_TINY
-    if (backup_dir != NULL)
-       free(backup_dir);
+    free(backup_dir);
 #endif
 #ifndef DISABLE_OPERATINGDIR
-    if (operating_dir != NULL)
-       free(operating_dir);
-    if (full_operating_dir != NULL)
-       free(full_operating_dir);
+    free(operating_dir);
+    free(full_operating_dir);
 #endif
+    free(answer);
     free(last_search);
     free(last_replace);
 #ifndef DISABLE_SPELLER
-    if (alt_speller != NULL)
-       free(alt_speller);
+    free(alt_speller);
 #endif
-    if (answer != NULL)
-       free(answer);
     if (cutbuffer != NULL)
        free_filestruct(cutbuffer);
 #ifndef DISABLE_JUSTIFY
@@ -1616,8 +1609,7 @@ void thanks_for_all_the_fish(void)
     if (openfile != NULL)
        free_openfilestruct(openfile);
 #ifndef DISABLE_COLOR
-    if (syntaxstr != NULL)
-       free(syntaxstr);
+    free(syntaxstr);
     while (syntaxes != NULL) {
        syntaxtype *bill = syntaxes;
 
@@ -1692,8 +1684,7 @@ void thanks_for_all_the_fish(void)
        free(s);
     }
 #ifndef DISABLE_NANORC
-    if (homedir != NULL)
-       free(homedir);
+    free(homedir);
 #endif
 }
 

diff --git a/src/help.c b/src/help.c
index 2ad5bce65e0397871245a365b7f0a6eb26f79f3b..a3c5477f5ba48928eb7d7507e5df2f24fb537818 100644 (file)
--- a/src/help.c
+++ b/src/help.c
@@ -387,8 +387,7 @@ void help_init(void)
 
     /* help_text has been freed and set to NULL unless the user resized
      * while in the help screen. */
-    if (help_text != NULL)
-       free(help_text);
+    free(help_text);
 
     /* Allocate space for the help text. */
     help_text = charalloc(allocsize + 1);

diff --git a/src/nano.c b/src/nano.c
index 6cb9127d40fc2da987460848f8b60babd7c64648..e5540a06a1deea698c0b7ccce1007461e5e41862 100644 (file)
--- a/src/nano.c
+++ b/src/nano.c
@@ -123,14 +123,10 @@ void delete_node(filestruct *fileptr)
 {
     assert(fileptr != NULL && fileptr->data != NULL);
 
-    if (fileptr->data != NULL)
-       free(fileptr->data);
-
+    free(fileptr->data);
 #ifndef DISABLE_COLOR
-    if (fileptr->multidata)
-       free(fileptr->multidata);
+    free(fileptr->multidata);
 #endif
-
     free(fileptr);
 }
 
@@ -572,10 +568,8 @@ void delete_opennode(openfilestruct *fileptr)
     free(fileptr->filename);
     free_filestruct(fileptr->fileage);
 #ifndef NANO_TINY
-    if (fileptr->current_stat != NULL)
-       free(fileptr->current_stat);
+    free(fileptr->current_stat);
 #endif
-
     free(fileptr);
 }
 

diff --git a/src/prompt.c b/src/prompt.c
index 61c4347f491730bd6af9435837d5248e7305cbf7..2cd5b7ab08e6e018a5a1047406c66d7d3031a0c3 100644 (file)
--- a/src/prompt.c
+++ b/src/prompt.c
@@ -918,8 +918,7 @@ functionptrtype get_prompt_string(int *actual, bool allow_tabs,
     if (history_list != NULL) {
        history_reset(*history_list);
 
-       if (magichistory != NULL)
-           free(magichistory);
+       free(magichistory);
     }
 #endif
 
@@ -977,8 +976,7 @@ int do_prompt(bool allow_tabs,
 
     /* prompt has been freed and set to NULL unless the user resized
      * while at the statusbar prompt. */
-    if (prompt != NULL)
-       free(prompt);
+    free(prompt);
 
     prompt = charalloc(((COLS - 4) * mb_cur_max()) + 1);
 

diff --git a/src/rcfile.c b/src/rcfile.c
index 581456de5490438fb6851be2e663d59a55ade75b..abf9c07c7db95ba07a08fd01238a7adcc90a060d 100644 (file)
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -985,8 +985,7 @@ void parse_linter(char *ptr)
        return;
     }
 
-    if (endsyntax->linter != NULL)
-       free(endsyntax->linter);
+    free(endsyntax->linter);
 
     /* Let them unset the linter by using "". */
     if (!strcmp(ptr, "\"\""))
@@ -1012,8 +1011,7 @@ void parse_formatter(char *ptr)
        return;
     }
 
-    if (endsyntax->formatter != NULL)
-       free(endsyntax->formatter);
+    free(endsyntax->formatter);
 
     /* Let them unset the formatter by using "". */
     if (!strcmp(ptr, "\"\""))

diff --git a/src/text.c b/src/text.c
index 76524faa703151393b6967ed9a4a2c1baa08983c..f3637f8657bfa550ed2d18dbc8e1c3dfc71617fb 100644 (file)
--- a/src/text.c
+++ b/src/text.c
@@ -885,8 +885,7 @@ void add_undo(undo_type current_action)
     while (fs->undotop != NULL && fs->undotop != fs->current_undo) {
        undo *u2 = fs->undotop;
        fs->undotop = fs->undotop->next;
-       if (u2->strdata != NULL)
-           free(u2->strdata);
+       free(u2->strdata);
        if (u2->cutbuffer)
            free_filestruct(u2->cutbuffer);
        free(u2);