diff options
| author | Greg Hudson <ghudson@mit.edu> | 2013-03-29 02:53:27 -0400 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2013-03-29 11:38:39 -0400 |
| commit | f3de02250cdf2b912629b5420f83b937a62401be (patch) | |
| tree | aa3598db8197561b5f1a64042099b862e5f8448b | |
| parent | c388b28237386a8f41fcd88c06cc7049f295a69d (diff) | |
| download | krb5-f3de02250cdf2b912629b5420f83b937a62401be.tar.gz krb5-f3de02250cdf2b912629b5420f83b937a62401be.tar.xz krb5-f3de02250cdf2b912629b5420f83b937a62401be.zip | |
Free unconditionally in plugins.c
Get rid of unnecessary null checks before freeing values in
libkrb5support's plugin code.
| -rw-r--r-- | src/util/support/plugins.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/util/support/plugins.c b/src/util/support/plugins.c index 608d03c2f1..a04dfc38e9 100644 --- a/src/util/support/plugins.c +++ b/src/util/support/plugins.c @@ -155,8 +155,8 @@ int closedir(DIR *dp) { if (!dp) return 0; _findclose(dp->handle); - if (dp->dir) free(dp->dir); - if (dp) free(dp); + free(dp->dir); + free(dp); return 0; } @@ -317,7 +317,7 @@ krb5int_open_plugin (const char *filepath, struct plugin_file_handle **h, struct htmp = NULL; /* h takes ownership */ } - if (htmp != NULL) { free (htmp); } + free(htmp); return err; } @@ -551,7 +551,7 @@ krb5int_get_plugin_filenames (const char * const *filebases, char ***filenames) tempnames = NULL; } - if (tempnames) { krb5int_free_plugin_filenames (tempnames); } + krb5int_free_plugin_filenames(tempnames); return err; } @@ -602,7 +602,7 @@ krb5int_open_plugin_dirs (const char * const *dirnames, if (!err) { handle = NULL; } /* h takes ownership */ } - if (filepath != NULL) { free (filepath); } + free(filepath); if (handle != NULL) { krb5int_close_plugin (handle); } } } else { @@ -637,7 +637,7 @@ krb5int_open_plugin_dirs (const char * const *dirnames, } } - if (filepath != NULL) { free (filepath); } + free(filepath); if (handle != NULL) { krb5int_close_plugin (handle); } } @@ -727,7 +727,7 @@ krb5int_get_plugin_dir_data (struct plugin_dir_handle *dirhandle, p = NULL; /* ptrs takes ownership */ } - if (p != NULL) { free (p); } + free(p); return err; } @@ -786,7 +786,7 @@ krb5int_get_plugin_dir_func (struct plugin_dir_handle *dirhandle, p = NULL; /* ptrs takes ownership */ } - if (p != NULL) { free (p); } + free(p); return err; } |