This commit improve the warning message at pgxc_ctl make using gcc 4.8.

Author: koichi-szk

contrib/pgxc_ctl/bash_handler.c

@@ -35,14 +35,16 @@ install_pgxc_ctl_bash(char *path)
 	if (!pgxc_ctl_bash)
 	{
 		elog(ERROR, "ERROR: Could not open pgxc_ctl bash script, %s, %s\n", path, strerror(errno));
+		return;
 	}
 	for (i=0; pgxc_ctl_conf_prototype[i]; i++)
 		fprintf(pgxc_ctl_bash, "%s\n", pgxc_ctl_conf_prototype[i]);
 	for (i=0; pgxc_ctl_bash_script[i]; i++)
 		fprintf(pgxc_ctl_bash, "%s\n", pgxc_ctl_bash_script[i]);
 	fclose(pgxc_ctl_bash);
 	sprintf(cmd, "chmod +x %s", path);
-	system(cmd);
+	if (system(cmd) == -1)
+		elog(ERROR, "ERROR: system() function returned error, %s\n", strerror(errno));
 }
 
 /*

contrib/pgxc_ctl/config.c

@@ -226,7 +226,8 @@ install_conf_prototype(char *path)
 		fprintf(pgxc_config_proto, "%s\n", pgxc_ctl_conf_prototype[i]);
 	fclose(pgxc_config_proto);
 	snprintf(cmd, MAXPATH, "chmod +x %s", path);
-	system(cmd);
+	if (system(cmd) == -1)
+		elog(ERROR, "ERROR: system() function error, %s\n", strerror(errno));
 }
 
 /*

contrib/pgxc_ctl/datanode_cmd.c

@@ -841,7 +841,9 @@ failover_oneDatanode(int datanodeIdx)
 #endif
 				"select pgxc_pool_reload();\n"
 				"\\q\n",
+#if 0
 				aval(VAR_datanodeNames)[datanodeIdx],
+#endif
 				aval(VAR_datanodeNames)[datanodeIdx], aval(VAR_datanodeMasterServers)[datanodeIdx], aval(VAR_datanodePorts)[datanodeIdx]);
 		fclose(f);
 	}

contrib/pgxc_ctl/do_command.c

@@ -1979,8 +1979,7 @@ do_clean_command(char *line)
 		} while(GetToken());
 		if (cmdList)
 		{
-			int rc;
-			rc = doCmdList(cmdList);
+			doCmdList(cmdList);
 			cleanCmdList(cmdList);
 			elog(INFO, "Done.\n");
 		}

contrib/pgxc_ctl/do_shell.c

@@ -528,8 +528,8 @@ appendCmdEl(cmd_t *src, cmd_t *new)
 {
 	cmd_t *curr;
 
-	for(curr = src; src->next; src = src->next);
-	src->next = new;
+	for(curr = src; curr->next; curr = curr->next);
+	curr->next = new;
 }
 
 void

contrib/pgxc_ctl/monitor.c

@@ -286,7 +286,6 @@ void
 do_monitor_command(char *line)
 {
 	char *token;
-	int rc = 0;
 
 	if (!GetToken())
 	{
@@ -309,10 +308,10 @@ do_monitor_command(char *line)
 			if (isVarYes(VAR_gtmSlave))
 				monitor_gtm_slave();
 			else
-				elog(ERROR, "ERROR: gtm slave is not configured.\n"), rc=-1;
+				elog(ERROR, "ERROR: gtm slave is not configured.\n");
 		}
 		else
-			elog(ERROR, "Invalid monitor gtm command option.\n"), rc=-1;
+			elog(ERROR, "Invalid monitor gtm command option.\n");
 		return;
 	}
 	else if (TestToken("gtm_proxy"))
@@ -356,7 +355,7 @@ do_monitor_command(char *line)
 		else if (TestToken("slave"))
 		{
 			if (!isVarYes(VAR_coordSlave))
-				elog(ERROR, "ERROR: coordinator slave is not configured.\n"), rc = -1;
+				elog(ERROR, "ERROR: coordinator slave is not configured.\n");
 			else
 				if (!GetToken() || TestToken("all"))
 					monitor_coordinator_slave(aval(VAR_coordNames));
@@ -405,7 +404,7 @@ do_monitor_command(char *line)
 		else if (TestToken("slave"))
 		{
 			if (!isVarYes(VAR_coordSlave))
-				elog(ERROR, "ERROR: datanode slave is not configured.\n"), rc = -1;
+				elog(ERROR, "ERROR: datanode slave is not configured.\n");
 			else
 				if (!GetToken() || TestToken("all"))
 					monitor_datanode_slave(aval(VAR_coordNames));

contrib/pgxc_ctl/pgxc_ctl.c

@@ -168,7 +168,11 @@ build_pgxc_ctl_home(char *home)
 			}
 		}
 		snprintf(cmd, MAXLINE, "mkdir -p %s", pgxc_ctl_home);
-		system(cmd);
+		if (system(cmd) == -1)
+		{
+			fprintf(stderr, "ERROR: system() function error, %s\n", strerror(errno));
+			return;
+		}
 		if (stat(pgxc_ctl_home, &buf) ==0)
 		{
 			if (S_ISDIR(buf.st_mode))
@@ -285,7 +289,8 @@ pgxcCtlMkdir(char *path)
 	char cmd[MAXPATH+1];
 
 	snprintf(cmd, MAXPATH, "mkdir -p %s", path);
-	system(cmd);
+	if (system(cmd) == -1)
+		elog(ERROR, "ERROR: system() function error, %s\n", strerror(errno));
 }
 
 static void
@@ -521,6 +526,8 @@ main(int argc, char *argv[])
 		reset_var_val(VAR_logDir, logdir);
 	if (logfile)
 		reset_var_val(VAR_logFile, logfile);
+	if (verbose)
+		reset_var_val(VAR_verbose, verbose);
 	startLog(sval(VAR_logDir), sval(VAR_logFile));
 	prepare_pgxc_ctl_bash(pgxc_ctl_bash_path);
 	build_configuration_path(configuration);

contrib/pgxc_ctl/utils.c

@@ -298,13 +298,12 @@ get_prog_pid(char *host, char *progname, char *dir)
 			 "\"ps -f -C %s | grep %s\"",
 			 sval(VAR_pgxcUser), host, progname, dir);
 	wkf = popen(cmd, "r");
-	if (wkf == NULL)
+	if ((wkf == NULL) || (fgets(pid_s, MAXLINE, wkf) != pid_s))
 	{
 		elog(ERROR, "ERROR: cannot obtain pid value of the remote postmaster, host \"%s\" dir \"%s\", %s\n",
 					host, dir, strerror(errno));
 		return(-1);
 	}
-	fgets(pid_s, MAXLINE, wkf);
 	fclose(wkf);
 	/* Get the second token */
 	line = pid_s;
@@ -404,7 +403,8 @@ getIpAddress(char *hostName)
 		return NULL;
 	}
 	ipAddr = Malloc(MAXTOKEN+1);
-	fgets(ipAddr, MAXTOKEN, f);
+	if (fgets(ipAddr, MAXTOKEN, f) != ipAddr)
+		ipAddr[0] = '\0';
 	fclose(f);
 	trimNl(ipAddr);
 	return ipAddr;