github/repmgr
1
0
Fork 0
mirror of https://github.com/EnterpriseDB/repmgr.git synced 2026-03-26 08:36:30 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

avoid usage of snprintf()

Browse Source 
We have a nice little abstraction for snprintf with covering the case
that a string is too big for the target buffer – let's use that!
This commit is contained in:
Christian Kruse
2014-03-06 18:11:04 +01:00
committed by Jaime Casanova
parent 24bd4e7a3f
commit 65989840d2
3 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
log.c
View File

@@ -40,10 +40,8 @@
/* #define REPMGR_DEBUG */ /* #define REPMGR_DEBUG */
void void
stderr_log_with_level(const char *level_name, int level, const char *fmt,...) stderr_log_with_level(const char *level_name, int level, const char *fmt, ...)
{ {
size_t len = strlen(fmt);
char fmt1[len + 150];
time_t t; time_t t;
struct tm *tm; struct tm *tm;
char buff[100]; char buff[100];
@@ -53,13 +51,11 @@ stderr_log_with_level(const char *level_name, int level, const char *fmt,...)
{ {
time(&t); time(&t);
tm = localtime(&t); tm = localtime(&t);
strftime(buff, 100, "[%Y-%m-%d %H:%M:%S]", tm);
fprintf(stderr, "%s [%s] ", buff, level_name);
va_start(ap, fmt); va_start(ap, fmt);
vfprintf(stderr, fmt, ap);
strftime(buff, 100, "[%Y-%m-%d %H:%M:%S]", tm);
snprintf(fmt1, len + 150, "%s [%s] %s", buff, level_name, fmt);
vfprintf(stderr, fmt1, ap);
va_end(ap); va_end(ap);
fflush(stderr); fflush(stderr);

12
repmgr.c
View File

@@ -337,7 +337,7 @@ main(int argc, char **argv)
} }
/* Prepare the repmgr schema variable */ /* Prepare the repmgr schema variable */
snprintf(repmgr_schema, MAXLEN, "%s%s", DEFAULT_REPMGR_SCHEMA_PREFIX, maxlen_snprintf(repmgr_schema, "%s%s", DEFAULT_REPMGR_SCHEMA_PREFIX,
options.cluster_name); options.cluster_name);
switch (action) switch (action)
@@ -1698,7 +1698,7 @@ do_witness_create(void)
* default port for the witness is 5499, but user can provide a different * default port for the witness is 5499, but user can provide a different
* one * one
*/ */
snprintf(buf, sizeof(buf), "%s/postgresql.conf", runtime_options.dest_dir); xsnprintf(buf, sizeof(buf), "%s/postgresql.conf", runtime_options.dest_dir);
pg_conf = fopen(buf, "a"); pg_conf = fopen(buf, "a");
if (pg_conf == NULL) if (pg_conf == NULL)
{ {
@@ -1708,18 +1708,18 @@ do_witness_create(void)
exit(ERR_BAD_CONFIG); exit(ERR_BAD_CONFIG);
} }
snprintf(buf, sizeof(buf), "\n#Configuration added by %s\n", progname); xsnprintf(buf, sizeof(buf), "\n#Configuration added by %s\n", progname);
fputs(buf, pg_conf); fputs(buf, pg_conf);
if (!runtime_options.localport[0]) if (!runtime_options.localport[0])
strncpy(runtime_options.localport, "5499", MAXLEN); strncpy(runtime_options.localport, "5499", MAXLEN);
snprintf(buf, sizeof(buf), "port = %s\n", runtime_options.localport); xsnprintf(buf, sizeof(buf), "port = %s\n", runtime_options.localport);
fputs(buf, pg_conf); fputs(buf, pg_conf);
snprintf(buf, sizeof(buf), "shared_preload_libraries = 'repmgr_funcs'\n"); xsnprintf(buf, sizeof(buf), "shared_preload_libraries = 'repmgr_funcs'\n");
fputs(buf, pg_conf); fputs(buf, pg_conf);
snprintf(buf, sizeof(buf), "listen_addresses = '*'\n"); xsnprintf(buf, sizeof(buf), "listen_addresses = '*'\n");
fputs(buf, pg_conf); fputs(buf, pg_conf);
fclose(pg_conf); fclose(pg_conf);

2
repmgrd.c
View File

@@ -281,7 +281,7 @@ main(int argc, char **argv)
} }
} }
snprintf(repmgr_schema, MAXLEN, "%s%s", DEFAULT_REPMGR_SCHEMA_PREFIX, xsnprintf(repmgr_schema, MAXLEN, "%s%s", DEFAULT_REPMGR_SCHEMA_PREFIX,
local_options.cluster_name); local_options.cluster_name);
log_info(_("%s Connecting to database '%s'\n"), progname, log_info(_("%s Connecting to database '%s'\n"), progname,