Rename config.[ch] to configfile.[ch]

This commit is contained in:
Ian Barwick
2017-07-16 09:41:26 +09:00
parent b1051bfca2
commit a29bc3e0fa
8 changed files with 11 additions and 12 deletions

View File

@@ -28,8 +28,8 @@ $(info Building against PostgreSQL $(MAJORVERSION))
REPMGR_CLIENT_OBJS = repmgr-client.o \ REPMGR_CLIENT_OBJS = repmgr-client.o \
repmgr-action-primary.o repmgr-action-standby.o repmgr-action-bdr.o repmgr-action-cluster.o \ repmgr-action-primary.o repmgr-action-standby.o repmgr-action-bdr.o repmgr-action-cluster.o \
config.o log.o strutil.o dbutils.o dirutil.o compat.o controldata.o configfile.o log.o strutil.o dbutils.o dirutil.o compat.o controldata.o
REPMGRD_OBJS = repmgrd.o repmgrd-physical.o repmgrd-bdr.o config.o log.o dbutils.o strutil.o REPMGRD_OBJS = repmgrd.o repmgrd-physical.o repmgrd-bdr.o configfile.o log.o dbutils.o strutil.o
$(REPMGR_CLIENT_OBJS): repmgr-client.h $(REPMGR_CLIENT_OBJS): repmgr-client.h
@@ -61,7 +61,7 @@ additional-clean:
rm -f repmgrd-physical.o rm -f repmgrd-physical.o
rm -f repmgrd-bdr.o rm -f repmgrd-bdr.o
rm -f compat.o rm -f compat.o
rm -f config.o rm -f configfile.o
rm -f controldata.o rm -f controldata.o
rm -f dbutils.o rm -f dbutils.o
rm -f dirutil.o rm -f dirutil.o

View File

@@ -7,7 +7,7 @@
#include <sys/stat.h> /* for stat() */ #include <sys/stat.h> /* for stat() */
#include "repmgr.h" #include "repmgr.h"
#include "config.h" #include "configfile.h"
#include "log.h" #include "log.h"
const static char *_progname = NULL; const static char *_progname = NULL;

View File

@@ -1,5 +1,5 @@
/* /*
* config.h * configfile.h
* *
* Copyright (c) 2ndQuadrant, 2010-2017 * Copyright (c) 2ndQuadrant, 2010-2017
* *

View File

@@ -11,7 +11,7 @@
#include "pqexpbuffer.h" #include "pqexpbuffer.h"
#include "portability/instr_time.h" #include "portability/instr_time.h"
#include "config.h" #include "configfile.h"
#include "strutil.h" #include "strutil.h"
#include "voting.h" #include "voting.h"

View File

@@ -6,7 +6,7 @@
#ifndef _REPMGR_CLIENT_GLOBAL_H_ #ifndef _REPMGR_CLIENT_GLOBAL_H_
#define _REPMGR_CLIENT_GLOBAL_H_ #define _REPMGR_CLIENT_GLOBAL_H_
#include "config.h" #include "configfile.h"
/* values for --copy-external-config-files */ /* values for --copy-external-config-files */
#define CONFIG_FILE_SAMEPATH 1 #define CONFIG_FILE_SAMEPATH 1

View File

@@ -15,7 +15,7 @@
#include "repmgr_version.h" #include "repmgr_version.h"
#include "errcode.h" #include "errcode.h"
#include "strutil.h" #include "strutil.h"
#include "config.h" #include "configfile.h"
#include "dbutils.h" #include "dbutils.h"
#include "log.h" #include "log.h"
@@ -51,4 +51,5 @@
#define ERRBUFF_SIZE 512 #define ERRBUFF_SIZE 512
#endif /* _REPMGR_H_ */ #endif /* _REPMGR_H_ */

View File

@@ -9,7 +9,7 @@
#include "repmgr.h" #include "repmgr.h"
#include "repmgrd.h" #include "repmgrd.h"
#include "repmgrd-bdr.h" #include "repmgrd-bdr.h"
#include "config.h" #include "configfile.h"
static volatile sig_atomic_t got_SIGHUP = false; static volatile sig_atomic_t got_SIGHUP = false;

View File

@@ -10,13 +10,11 @@
#include <sys/stat.h> #include <sys/stat.h>
#include "repmgr.h" #include "repmgr.h"
#include "repmgrd.h" #include "repmgrd.h"
#include "repmgrd-physical.h" #include "repmgrd-physical.h"
#include "repmgrd-bdr.h" #include "repmgrd-bdr.h"
#include "config.h" #include "configfile.h"
#include "voting.h" #include "voting.h"
#define OPT_HELP 1 #define OPT_HELP 1