github/repmgr
1
0
Fork 0
mirror of https://github.com/EnterpriseDB/repmgr.git synced 2026-03-22 22:56:29 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

configuration: clean up unneeded code and comments

Browse Source
This commit is contained in:
Ian Barwick
2020-05-14 15:39:51 +09:00
parent ff4771ab02
commit 5c16e94672
2 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configfile-scan.l
View File

@@ -109,7 +109,7 @@ ProcessRepmgrConfigFile(const char *config_file, const char *base_dir, ItemList
extern bool extern bool
ProcessPostgresConfigFile(const char *config_file, const char *base_dir, KeyValueList *contents, ItemList *error_list, ItemList *warning_list) ProcessPostgresConfigFile(const char *config_file, const char *base_dir, KeyValueList *contents, ItemList *error_list, ItemList *warning_list)
{ {
printf("ProcessPostgresConfigFile(): base: %s file: %s\n", base_dir, config_file); //printf("ProcessPostgresConfigFile(): base: %s file: %s\n", base_dir, config_file);
return ProcessConfigFile(base_dir, config_file, NULL, true, contents, error_list, warning_list); return ProcessConfigFile(base_dir, config_file, NULL, true, contents, error_list, warning_list);
} }

15
configfile.c
View File

@@ -1486,7 +1486,7 @@ repmgr_atoi(const char *value, const char *config_item, ItemList *error_list, in
void void
repmgr_canonicalize_path(const char *name, const char *value, char *config_item, ItemList *errors) repmgr_canonicalize_path(const char *name, const char *value, char *config_item, ItemList *errors)
{ {
// XXX check for errors? /* NOTE: canonicalize_path does not produce any errors */
canonicalize_path(config_item); canonicalize_path(config_item);
} }
@@ -1711,19 +1711,6 @@ modify_auto_conf(const char *data_dir, KeyValueList *items)
appendPQExpBuffer(&auto_conf, "%s/%s", appendPQExpBuffer(&auto_conf, "%s/%s",
data_dir, PG_AUTOCONF_FILENAME); data_dir, PG_AUTOCONF_FILENAME);
// XXX do we need this?
fp = fopen(auto_conf.data, "r");
if (fp == NULL)
{
fprintf(stderr, "unable to open \"%s\": %s\n",
auto_conf.data,
strerror(errno));
termPQExpBuffer(&auto_conf);
return false;
}
fclose(fp);
success = ProcessPostgresConfigFile(auto_conf.data, NULL, &config, NULL, NULL); success = ProcessPostgresConfigFile(auto_conf.data, NULL, &config, NULL, NULL);
if (success == false) if (success == false)