diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2018-05-02 15:52:54 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2018-05-02 15:52:54 -0400 |
| commit | fbb2e9a030ee7a3fa20ce402e4b1da9809b4eb52 (patch) | |
| tree | 79bd48ec2dccce2957bf56d62019f24a86ab181c /src/backend/utils/adt/numeric.c | |
| parent | 447dbf7aa7909bca76048042d6734ee8f5249d0f (diff) | |
| download | postgresql-fbb2e9a030ee7a3fa20ce402e4b1da9809b4eb52.tar.gz postgresql-fbb2e9a030ee7a3fa20ce402e4b1da9809b4eb52.zip | |
Fix assorted compiler warnings seen in the buildfarm.
Failure to use DatumGetFoo/FooGetDatum macros correctly, or at all,
causes some warnings about sign conversion. This is just cosmetic
at the moment but in principle it's a type violation, so clean up
the instances I could find.
autoprewarm.c and sharedfileset.c contained code that unportably
assumed that pid_t is the same size as int. We've variously dealt
with this by casting pid_t to int or to unsigned long for printing
purposes; I went with the latter.
Fix uninitialized-variable warning in RestoreGUCState. This is
a live bug in some sense, but of no great significance given that
nobody is very likely to care what "line number" is associated with
a GUC that hasn't got a source file recorded.
Diffstat (limited to 'src/backend/utils/adt/numeric.c')
| -rw-r--r-- | src/backend/utils/adt/numeric.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/backend/utils/adt/numeric.c b/src/backend/utils/adt/numeric.c index c56d5afcb3b..dcf31e340c1 100644 --- a/src/backend/utils/adt/numeric.c +++ b/src/backend/utils/adt/numeric.c @@ -3818,8 +3818,8 @@ numeric_avg_deserialize(PG_FUNCTION_ARGS) /* sumX */ temp = DirectFunctionCall3(numeric_recv, PointerGetDatum(&buf), - InvalidOid, - -1); + ObjectIdGetDatum(InvalidOid), + Int32GetDatum(-1)); init_var_from_num(DatumGetNumeric(temp), &tmp_var); accum_sum_add(&(result->sumX), &tmp_var); @@ -3941,16 +3941,16 @@ numeric_deserialize(PG_FUNCTION_ARGS) /* sumX */ temp = DirectFunctionCall3(numeric_recv, PointerGetDatum(&buf), - InvalidOid, - -1); + ObjectIdGetDatum(InvalidOid), + Int32GetDatum(-1)); init_var_from_num(DatumGetNumeric(temp), &sumX_var); accum_sum_add(&(result->sumX), &sumX_var); /* sumX2 */ temp = DirectFunctionCall3(numeric_recv, PointerGetDatum(&buf), - InvalidOid, - -1); + ObjectIdGetDatum(InvalidOid), + Int32GetDatum(-1)); init_var_from_num(DatumGetNumeric(temp), &sumX2_var); accum_sum_add(&(result->sumX2), &sumX2_var); @@ -4340,14 +4340,14 @@ numeric_poly_deserialize(PG_FUNCTION_ARGS) /* sumX */ sumX = DirectFunctionCall3(numeric_recv, PointerGetDatum(&buf), - InvalidOid, - -1); + ObjectIdGetDatum(InvalidOid), + Int32GetDatum(-1)); /* sumX2 */ sumX2 = DirectFunctionCall3(numeric_recv, PointerGetDatum(&buf), - InvalidOid, - -1); + ObjectIdGetDatum(InvalidOid), + Int32GetDatum(-1)); init_var_from_num(DatumGetNumeric(sumX), &sumX_var); #ifdef HAVE_INT128 @@ -4550,8 +4550,8 @@ int8_avg_deserialize(PG_FUNCTION_ARGS) /* sumX */ temp = DirectFunctionCall3(numeric_recv, PointerGetDatum(&buf), - InvalidOid, - -1); + ObjectIdGetDatum(InvalidOid), + Int32GetDatum(-1)); init_var_from_num(DatumGetNumeric(temp), &num); #ifdef HAVE_INT128 numericvar_to_int128(&num, &result->sumX); |