fix review comments per Cedric suggestions

OreoYang · OreoYang · commit a1a2431cb99f · 2025-12-09T14:01:32.000+08:00
diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c
@@ -3730,7 +3730,6 @@ SendQuery_PBE(const char *query, HostVariable *hv)
 	PGTransactionStatusType transaction_status;
 	double		elapsed_msec = 0;
 	bool		OK = false;
-	int		i = 0;
 	bool		on_error_rollback_savepoint = false;
 	static bool on_error_rollback_warning = false;
 
@@ -3837,7 +3836,6 @@ SendQuery_PBE(const char *query, HostVariable *hv)
 		struct _variable **bindvar;
 		char	*p = NULL;
 		bool	missing = false;
-		int		j;
 		instr_time	before,
 					after;
 
@@ -3851,13 +3849,13 @@ SendQuery_PBE(const char *query, HostVariable *hv)
 		 * the order of detection in the Oracle error message is from the
 		 * back to the front.
 		 */
-		for (j = hv->length; j > 0; j--)
+		for (int i = hv->length; i > 0; i--)
 		{
-			p = hv->hostvars[j - 1].name;
+			p = hv->hostvars[i - 1].name;
 			p++;	/* skip colon */
-			bindvar[j - 1] = BindVariableExist(pset.vars, p);
+			bindvar[i - 1] = BindVariableExist(pset.vars, p);
 
-			if (bindvar[j - 1] == NULL)
+			if (bindvar[i - 1] == NULL)
 			{
 				missing= true;
 				break;
@@ -4039,7 +4037,7 @@ SendQuery_PBE(const char *query, HostVariable *hv)
 
 	/* reset \crosstabview trigger */
 	pset.crosstab_flag = false;
-	for (i = 0; i < lengthof(pset.ctv_args); i++)
+	for (int i = 0; i < lengthof(pset.ctv_args); i++)
 	{
 		pg_free(pset.ctv_args[i]);
 		pset.ctv_args[i] = NULL;
diff --git a/src/interfaces/libpq/ivy-exec.c b/src/interfaces/libpq/ivy-exec.c
@@ -3763,7 +3763,6 @@ Ivyreplacenamebindtoposition(Ivyconn *tconn,
 				size_t size_error_buf,
 				bool *iscallinto)
 {
-	int	i = 0;
 	Ivyresult *res;
 	IvyBindOutNameInfo *tmp;
 
@@ -3787,7 +3786,7 @@ Ivyreplacenamebindtoposition(Ivyconn *tconn,
 		char	*convertcall = NULL;
 		char	*newsql = NULL;
 		char	*ptr = NULL;
-		int	j = 0;
+		const char *query_ptr = NULL;
 
 		query_len = (stmtHandle->query_len * 2) + strlen("select * from get_parameter_description(") + 5;
 		query = (char *) malloc(query_len);
@@ -3800,12 +3799,14 @@ Ivyreplacenamebindtoposition(Ivyconn *tconn,
 
 		newsql = malloc(stmtHandle->query_len * 2);	/* enough */
 		ptr = newsql;
-		while (stmtHandle->query[j] != '\0')
+		query_ptr = stmtHandle->query;
+		
+		while (*query_ptr != '\0')
 		{
-			if (stmtHandle->query[j] == '\'')
-				*ptr++ = stmtHandle->query[j];
-			*ptr++ = stmtHandle->query[j];
-			j++;
+			if (*query_ptr == '\'')
+				*ptr++ = *query_ptr;
+			*ptr++ = *query_ptr;
+			query_ptr++;
 		}
 		*ptr = '\0';
 
@@ -3965,14 +3966,14 @@ Ivyreplacenamebindtoposition(Ivyconn *tconn,
 
 		stmtHandle->paramNames = (char **) malloc(sizeof(char *) * (n_tuples - 1));
 		memset(stmtHandle->paramNames, 0x00, sizeof(char *) * (n_tuples - 1));
-		for (j = 1; j < n_tuples; j++)
+		for (int i = 1; i < n_tuples; i++)
 		{
 			int position;
 			char *name;
 			size_t name_len;
 
-			position = atoi(Ivygetvalue(res, j, 1)) - 1;
-			name = Ivygetvalue(res, j, 0);
+			position = atoi(Ivygetvalue(res, i, 1)) - 1;
+			name = Ivygetvalue(res, i, 0);
 
 			if (stmtHandle->paramNames[position] != NULL)
 				goto error_handle;
@@ -4034,7 +4035,7 @@ Ivyreplacenamebindtoposition(Ivyconn *tconn,
 		"get_parameter_description return failed");
 
 	Ivyclear(res);
-	for (i = 0; i < stmtHandle->nParams; i++)
+	for (int i = 0; i < stmtHandle->nParams; i++)
 	{
 		if (stmtHandle->paramNames[i] != NULL)
 			free(stmtHandle->paramNames[i]);
@@ -4073,7 +4074,7 @@ Ivyreplacenamebindtoposition2(Ivyconn *tconn,
 		char	*newsql = NULL;
 		char	*ptr = NULL;
 		const char *query_ptr = NULL;
-		
+
 		query_len = (strlen(stmtHandle->query) * 2) + strlen("select * from get_parameter_description(") + 5;
 		query = (char *) malloc(query_len);
 
