Attempt to fix some compiler warnings.

robertmhaas · robertmhaas · commit ef3f9e642d2b · 2015-04-29T14:02:27.000-04:00
diff --git a/src/backend/utils/adt/formatting.c b/src/backend/utils/adt/formatting.c
@@ -2507,7 +2507,7 @@ DCH_to_char(FormatNode *node, bool is_interval, TmToChar *in, char *out, Oid col
 				s += strlen(s);
 				if (tm->tm_gmtoff % SECS_PER_HOUR != 0)
 				{
-					sprintf(s, ":%02ld", abs(tm->tm_gmtoff % SECS_PER_HOUR) / SECS_PER_MINUTE);
+					sprintf(s, ":%02d", abs(tm->tm_gmtoff % SECS_PER_HOUR) / SECS_PER_MINUTE);
 					s += strlen(s);
 				}
 				break;
diff --git a/src/backend/utils/fmgr/funcapi.c b/src/backend/utils/fmgr/funcapi.c
@@ -887,7 +887,6 @@ get_func_trftypes(HeapTuple procTup,
 				  Oid **p_trftypes)
 {
 
-	Form_pg_proc procStruct = (Form_pg_proc) GETSTRUCT(procTup);
 	Datum		protrftypes;
 	ArrayType  *arr;
 	int			nelems;
@@ -911,7 +910,7 @@ get_func_trftypes(HeapTuple procTup,
 			ARR_HASNULL(arr) ||
 			ARR_ELEMTYPE(arr) != OIDOID)
 			elog(ERROR, "protrftypes is not a 1-D Oid array");
-		Assert(nelems >= procStruct->pronargs);
+		Assert(nelems >= ((Form_pg_proc) GETSTRUCT(procTup))->pronargs);
 		*p_trftypes = (Oid *) palloc(nelems * sizeof(Oid));
 		memcpy(*p_trftypes, ARR_DATA_PTR(arr),
 			   nelems * sizeof(Oid));

Original file line number	Diff line number	Diff line change
`@@ -2507,7 +2507,7 @@ DCH_to_char(FormatNode node, bool is_interval, TmToChar in, char *out, Oid col`
`2507`	`2507`	`s += strlen(s);`
`2508`	`2508`	`if (tm->tm_gmtoff % SECS_PER_HOUR != 0)`
`2509`	`2509`	`{`
`2510`		`- sprintf(s, ":%02ld", abs(tm->tm_gmtoff % SECS_PER_HOUR) / SECS_PER_MINUTE);`
	`2510`	`+ sprintf(s, ":%02d", abs(tm->tm_gmtoff % SECS_PER_HOUR) / SECS_PER_MINUTE);`
`2511`	`2511`	`s += strlen(s);`
`2512`	`2512`	`}`
`2513`	`2513`	`break;`