From ef3f9e642d2b2bba8933b4cff4039ce0d354ce08 Mon Sep 17 00:00:00 2001 From: Robert Haas Date: Wed, 29 Apr 2015 14:02:01 -0400 Subject: [PATCH] Attempt to fix some compiler warnings. --- src/backend/utils/adt/formatting.c | 2 +- src/backend/utils/fmgr/funcapi.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/backend/utils/adt/formatting.c b/src/backend/utils/adt/formatting.c index 576db95c1b..233fe2f0f8 100644 --- 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 index ebd7ddd387..fccef38249 100644 --- 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)); -- 2.40.0