summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Haas2015-04-29 18:02:01 +0000
committerRobert Haas2015-04-29 18:02:27 +0000
commitef3f9e642d2b2bba8933b4cff4039ce0d354ce08 (patch)
tree170111186038821fa7b8d51d9cf6097160a34b5b
parenteb010637dd47be65e5d8b22d6965c2e96f6937b8 (diff)
Attempt to fix some compiler warnings.
-rw-r--r--src/backend/utils/adt/formatting.c2
-rw-r--r--src/backend/utils/fmgr/funcapi.c3
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));