diff options
author | Jim Meyering <jim@meyering.net> | 2008-06-02 06:00:54 +0000 |
---|---|---|
committer | Jim Meyering <jim@meyering.net> | 2008-06-02 06:00:54 +0000 |
commit | cdf90071d2422f8eebb4cdc1fa3e2c584c90784b (patch) | |
tree | 7ef2eba7d4a06c023f3160da5629c53fde6366f4 /src | |
parent | ca80b43970689e26d878812e77bdf8b9be738acb (diff) | |
download | emacs-cdf90071d2422f8eebb4cdc1fa3e2c584c90784b.tar.gz |
remove useless if-before-free tests
* lib-src/ebrowse.c (xfree): Likewise.
* lib-src/etags.c (process_file_name, free_tree, free_fdesc): Likewise.
(popclass_above, Prolog_functions, Erlang_functions): Likewise.
* lib-src/pop.c (pop_quit): Likewise.
* lwlib/lwlib-Xm.c (xm_update_one_value): Likewise.
* lwlib/lwlib.c (safe_free_str, free_widget_value_tree): Likewise.
* src/editfns.c (Fset_time_zone_rule): Likewise.
* src/lread.c (nosuffix): Likewise.
* src/ralloc.c (get_bloc): Likewise.
* src/regex.c (reg_free): Likewise.
* src/xftfont.c (xftfont_open, xftfont_close): Likewise.
* src/xrdb.c (get_user_app, get_environ_db, x_load_resources): Likewise.
* src/xsmfns.c (smc_save_yourself_CB): Likewise.
Diffstat (limited to 'src')
-rw-r--r-- | src/ChangeLog | 11 | ||||
-rw-r--r-- | src/editfns.c | 3 | ||||
-rw-r--r-- | src/lread.c | 3 | ||||
-rw-r--r-- | src/ralloc.c | 3 | ||||
-rw-r--r-- | src/regex.c | 9 | ||||
-rw-r--r-- | src/xrdb.c | 13 | ||||
-rw-r--r-- | src/xsmfns.c | 3 |
7 files changed, 23 insertions, 22 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index a6caa011af3..4b33d8e97da 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,14 @@ +2008-06-02 Jim Meyering <meyering@redhat.com> + + remove useless if-before-free tests + * src/editfns.c (Fset_time_zone_rule): Likewise. + * src/lread.c (nosuffix): Likewise. + * src/ralloc.c (get_bloc): Likewise. + * src/regex.c (reg_free): Likewise. + * src/xftfont.c (xftfont_open, xftfont_close): Likewise. + * src/xrdb.c (get_user_app, get_environ_db, x_load_resources): Likewise. + * src/xsmfns.c (smc_save_yourself_CB): Likewise. + 2008-06-02 Kenichi Handa <handa@m17n.org> * font.c (font_find_for_lface): Handle float font size. diff --git a/src/editfns.c b/src/editfns.c index 95ad2f1aaaf..192277e4295 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -2038,8 +2038,7 @@ If TZ is t, use Universal Time. */) } set_time_zone_rule (tzstring); - if (environbuf) - free (environbuf); + free (environbuf); environbuf = environ; return Qnil; diff --git a/src/lread.c b/src/lread.c index 1bc9ec3ee0d..578addf1329 100644 --- a/src/lread.c +++ b/src/lread.c @@ -1269,8 +1269,7 @@ Return t if the file exists and loads successfully. */) UNGCPRO; - if (saved_doc_string) - free (saved_doc_string); + free (saved_doc_string); saved_doc_string = 0; saved_doc_string_size = 0; diff --git a/src/ralloc.c b/src/ralloc.c index 652cf3089a3..1c988283dbc 100644 --- a/src/ralloc.c +++ b/src/ralloc.c @@ -425,8 +425,7 @@ get_bloc (size) if (! (new_bloc = (bloc_ptr) malloc (BLOC_PTR_SIZE)) || ! (new_bloc->data = obtain (break_value, size))) { - if (new_bloc) - free (new_bloc); + free (new_bloc); return 0; } diff --git a/src/regex.c b/src/regex.c index cbc67568743..8ffd2be6ded 100644 --- a/src/regex.c +++ b/src/regex.c @@ -6841,20 +6841,17 @@ void regfree (preg) regex_t *preg; { - if (preg->buffer != NULL) - free (preg->buffer); + free (preg->buffer); preg->buffer = NULL; preg->allocated = 0; preg->used = 0; - if (preg->fastmap != NULL) - free (preg->fastmap); + free (preg->fastmap); preg->fastmap = NULL; preg->fastmap_accurate = 0; - if (preg->translate != NULL) - free (preg->translate); + free (preg->translate); preg->translate = NULL; } WEAK_ALIAS (__regfree, regfree) diff --git a/src/xrdb.c b/src/xrdb.c index e199c60a798..961f2748b58 100644 --- a/src/xrdb.c +++ b/src/xrdb.c @@ -431,13 +431,11 @@ get_user_app (class) { XrmDatabase db = XrmGetFileDatabase (file); free (file); - if (free_it) - free (free_it); + free (free_it); return db; } - if (free_it) - free (free_it); + free (free_it); return NULL; } @@ -504,8 +502,8 @@ get_environ_db () db = XrmGetFileDatabase (p); - if (path) free (path); - if (home) free (home); + free (path); + free (home); return db; } @@ -612,8 +610,7 @@ x_load_resources (display, xrm_string, myname, myclass) /* Figure out what the "customization string" is, so we can use it to decode paths. */ - if (x_customization_string) - free (x_customization_string); + free (x_customization_string); x_customization_string = x_get_customization_string (user_database, myname, myclass); diff --git a/src/xsmfns.c b/src/xsmfns.c index 538698a2782..ecbf2596e01 100644 --- a/src/xsmfns.c +++ b/src/xsmfns.c @@ -262,8 +262,7 @@ smc_save_yourself_CB (smcConn, xfree (smid_opt); - if (cwd) - free (cwd); + free (cwd); /* See if we maybe shall interact with the user. */ if (interactStyle != SmInteractStyleAny |