Fix for some warnings and compilation problems

erthalion · erthalion · commit 39509441a85c · 2016-09-06T22:36:42.000+07:00
diff --git a/src/backend/commands/typecmds.c b/src/backend/commands/typecmds.c
@@ -165,7 +165,7 @@ DefineType(List *names, List *parameters)
 	Oid			resulttype;
 	ListCell   *pl;
 	ObjectAddress address;
-	Oid			subscriptionOid;
+	Oid			subscriptionOid = InvalidOid;
 
 	/*
 	 * As of Postgres 8.4, we require superuser privilege to create a base
diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c
@@ -273,8 +273,8 @@ ExecEvalSubscriptionRef(SubscriptionRefExprState *sbstate,
 	RegProcedure			typsubscription;
 	bool					isAssignment = (sbsRef->refassgnexpr != NULL);
 	bool					eisnull;
-	Datum				   *upper,
-						   *lower;
+	Datum				   *upper = NULL,
+						   *lower = NULL;
 	ListCell			   *l;
 	int						i = 0,
 							j = 0;
diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c
@@ -24,6 +24,7 @@
 #include "catalog/pg_type.h"
 #include "funcapi.h"
 #include "libpq/pqformat.h"
+#include "nodes/makefuncs.h"
 #include "nodes/nodeFuncs.h"
 #include "utils/array.h"
 #include "utils/arrayaccess.h"
@@ -161,7 +162,8 @@ static int width_bucket_array_variable(Datum operand,
 							ArrayType *thresholds,
 							Oid collation,
 							TypeCacheEntry *typentry);
-
+static Datum array_subscription_prepare(PG_FUNCTION_ARGS);
+static Datum array_subscription_evaluate(PG_FUNCTION_ARGS);
 
 /*
  * array_in :
@@ -6727,9 +6729,10 @@ array_subscription_prepare(PG_FUNCTION_ARGS)
 	ParseState			*pstate = (ParseState *) PG_GETARG_POINTER(1);
 	Node				*node = (Node *)sbsref;
 	Oid					array_type = sbsref->refcontainertype;
-	Oid					array_typ_mode = sbsref->reftypmod;
+	int32				array_typ_mode = (int32) sbsref->reftypmod;
 	bool				is_slice = sbsref->reflowerindexpr != NIL;
-	Oid					typeneeded, typesource;
+	Oid					typeneeded = InvalidOid,
+						typesource = InvalidOid;
 	Node				*new_from;
 	Oid					element_type_id;
 	Node				*subexpr;
@@ -6849,12 +6852,12 @@ array_subscription_prepare(PG_FUNCTION_ARGS)
 								format_type_be(sbsref->refcontainertype)),
 						 parser_errposition(pstate, 0)));
 
-			return node;
+			PG_RETURN_POINTER(node);
 		}
 
 	}
 
-	return sbsref;
+	PG_RETURN_POINTER(sbsref);
 }
 
 Datum
@@ -6865,12 +6868,10 @@ array_subscription(PG_FUNCTION_ARGS)
 															 fcinfo->nargs);
 
 	if (op_type & SBS_VALIDATION)
-	{
 		return array_subscription_prepare(&target_fcinfo);
-	}
 
 	if (op_type & SBS_EXEC)
-	{
 		return array_subscription_evaluate(&target_fcinfo);
-	}
+
+	elog(ERROR, "incorrect op_type for subscription function: %d", op_type);
 }
diff --git a/src/backend/utils/adt/jsonfuncs.c b/src/backend/utils/adt/jsonfuncs.c
@@ -3924,9 +3924,9 @@ setPathObject(JsonbIterator **it, Datum *path_elems, bool *path_nulls,
 static void
 setPathArray(JsonbIterator **it, Datum *path_elems, bool *path_nulls,
 			 int path_len, JsonbParseState **st, int level,
-			 Jsonb *newval, uint32 nelems, int op_type)
+			 JsonbValue *newval, uint32 nelems, int op_type)
 {
-	JsonbValue	v;
+	JsonbValue	v, *new = (JsonbValue *) newval;
 	int			idx,
 				i;
 	bool		done = false;
@@ -3971,8 +3971,8 @@ setPathArray(JsonbIterator **it, Datum *path_elems, bool *path_nulls,
 	if ((idx == INT_MIN || nelems == 0) && (level == path_len - 1) &&
 		(op_type & JB_PATH_CREATE_OR_INSERT))
 	{
-		Assert(newval != NULL);
-		(void) pushJsonbValue(st, WJB_ELEM, newval);
+		Assert(new != NULL);
+		(void) pushJsonbValue(st, WJB_ELEM, new);
 		done = true;
 	}
 
@@ -3988,7 +3988,7 @@ setPathArray(JsonbIterator **it, Datum *path_elems, bool *path_nulls,
 				r = JsonbIteratorNext(it, &v, true);	/* skip */
 
 				if (op_type & (JB_PATH_INSERT_BEFORE | JB_PATH_CREATE))
-					(void) pushJsonbValue(st, WJB_ELEM, newval);
+					(void) pushJsonbValue(st, WJB_ELEM, new);
 
 				/*
 				 * We should keep current value only in case of
@@ -3999,13 +3999,13 @@ setPathArray(JsonbIterator **it, Datum *path_elems, bool *path_nulls,
 					(void) pushJsonbValue(st, r, &v);
 
 				if (op_type & JB_PATH_INSERT_AFTER)
-					(void) pushJsonbValue(st, WJB_ELEM, newval);
+					(void) pushJsonbValue(st, WJB_ELEM, new);
 
 				done = true;
 			}
 			else
 				(void) setPath(it, path_elems, path_nulls, path_len,
-							   st, level + 1, newval, op_type);
+							   st, level + 1, new, op_type);
 		}
 		else
 		{
