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

removed strncmp improper usage, initialise values asap

Browse Source
This commit is contained in:
Gabriele Bartolini
2010-12-16 22:21:27 +01:00
parent 763a1e8b3d
commit 05e88a2cc8
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config.c
View File

@@ -30,11 +30,11 @@ parse_config(const char *config_file, char *cluster_name, int *node, char *conni
parse_line(buff, name, value);
/* Copy into correct entry in parameters struct */
if (strncmp(name, "cluster", 7) == 0)
if (strcmp(name, "cluster") == 0)
strncpy (cluster_name, value, MAXLEN);
else if (strncmp(name, "node", 4) == 0)
else if (strcmp(name, "node") == 0)
*node = atoi(value);
else if (strncmp(name, "conninfo", 8) == 0)
else if (strcmp(name, "conninfo") == 0)
strncpy (conninfo, value, MAXLEN);
else
printf ("WARNING: %s/%s: Unknown name/value pair!\n", name, value);

34
dbutils.c
View File

@@ -11,20 +11,20 @@
PGconn *
establishDBConnection(const char *conninfo, const bool exit_on_error)
{
PGconn *conn;
/* Make a connection to the database */
conn = PQconnectdb(conninfo);
/* Check to see that the backend connection was successfully made */
if ((PQstatus(conn) != CONNECTION_OK))
{
fprintf(stderr, "Connection to database failed: %s",
/* Make a connection to the database */
PGconn *conn = PQconnectdb(conninfo);
/* Check to see that the backend connection was successfully made */
if ((PQstatus(conn) != CONNECTION_OK))
{
fprintf(stderr, "Connection to database failed: %s",
PQerrorMessage(conn));
if (exit_on_error)
{
PQfinish(conn);
PQfinish(conn);
exit(1);
}
}
}
return conn;
}
@@ -34,17 +34,17 @@ establishDBConnection(const char *conninfo, const bool exit_on_error)
bool
is_standby(PGconn *conn)
{
PGresult *res;
PGresult *res;
bool result;
res = PQexec(conn, "SELECT pg_is_in_recovery()");
if (PQresultStatus(res) != PGRES_TUPLES_OK)
{
fprintf(stderr, "Can't query server mode: %s", PQerrorMessage(conn));
PQclear(res);
PQfinish(conn);
res = PQexec(conn, "SELECT pg_is_in_recovery()");
if (PQresultStatus(res) != PGRES_TUPLES_OK)
{
fprintf(stderr, "Can't query server mode: %s", PQerrorMessage(conn));
PQclear(res);
PQfinish(conn);
exit(1);
}
}
if (strcmp(PQgetvalue(res, 0, 0), "f") == 0)
result = false;