diff options
| author | Peter Eisentraut <peter@eisentraut.org> | 2022-06-16 21:50:56 +0200 |
|---|---|---|
| committer | Peter Eisentraut <peter@eisentraut.org> | 2022-07-03 11:47:15 +0200 |
| commit | 02c408e21a6e78ff246ea7a1beb4669634fa9c4c (patch) | |
| tree | 7e4cf03f3de7e32af266b739e12c6600d871ed45 /src/backend/utils/misc/guc.c | |
| parent | 098c703d308fa88dc9e3f9f623ca023ce4717794 (diff) | |
| download | postgresql-02c408e21a6e78ff246ea7a1beb4669634fa9c4c.tar.gz | |
Remove redundant null pointer checks before free()
Per applicable standards, free() with a null pointer is a no-op.
Systems that don't observe that are ancient and no longer relevant.
Some PostgreSQL code already required this behavior, so this change
does not introduce any new requirements, just makes the code more
consistent.
Discussion: https://www.postgresql.org/message-id/flat/dac5d2d0-98f5-94d9-8e69-46da2413593d%40enterprisedb.com
Diffstat (limited to 'src/backend/utils/misc/guc.c')
| -rw-r--r-- | src/backend/utils/misc/guc.c | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index f640468f11..0328029d43 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -5483,8 +5483,7 @@ build_guc_variables(void) for (i = 0; ConfigureNamesEnum[i].gen.name; i++) guc_vars[num_vars++] = &ConfigureNamesEnum[i].gen; - if (guc_variables) - free(guc_variables); + free(guc_variables); guc_variables = guc_vars; num_guc_variables = num_vars; size_guc_variables = size_vars; @@ -6880,8 +6879,7 @@ ReportGUCOption(struct config_generic *record) * set last_reported to NULL and thereby possibly make a duplicate * report later. */ - if (record->last_reported) - free(record->last_reported); + free(record->last_reported); record->last_reported = strdup(val); } @@ -8356,8 +8354,7 @@ set_config_sourcefile(const char *name, char *sourcefile, int sourceline) return; sourcefile = guc_strdup(elevel, sourcefile); - if (record->sourcefile) - free(record->sourcefile); + free(record->sourcefile); record->sourcefile = sourcefile; record->sourceline = sourceline; } @@ -8877,8 +8874,7 @@ AlterSystemSetConfigFile(AlterSystemStmt *altersysstmt) if (record->vartype == PGC_STRING && newval.stringval != NULL) free(newval.stringval); - if (newextra) - free(newextra); + free(newextra); /* * We must also reject values containing newlines, because the @@ -11225,12 +11221,9 @@ RestoreGUCState(void *gucstate) * pointers. */ Assert(gconf->stack == NULL); - if (gconf->extra) - free(gconf->extra); - if (gconf->last_reported) /* probably can't happen */ - free(gconf->last_reported); - if (gconf->sourcefile) - free(gconf->sourcefile); + free(gconf->extra); + free(gconf->last_reported); + free(gconf->sourcefile); switch (gconf->vartype) { case PGC_BOOL: @@ -11261,8 +11254,7 @@ RestoreGUCState(void *gucstate) { struct config_string *conf = (struct config_string *) gconf; - if (*conf->variable) - free(*conf->variable); + free(*conf->variable); if (conf->reset_val && conf->reset_val != *conf->variable) free(conf->reset_val); if (conf->reset_extra && conf->reset_extra != gconf->extra) |