database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-27 23:21:58 +03:00
Code Activity

Float-to-int conversion functions should return NULL when given NULL

Browse Source 
input, not throw a gratuitous elog().
This commit is contained in:
Tom Lane
2000-03-23 07:40:00 +00:00
parent 37ab088770
commit 5c63975504
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/backend/utils/adt/float.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.54 2000/03/14 23:06:36 thomas Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.55 2000/03/23 07:40:00 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -830,8 +830,8 @@ dtoi4(float64 num)
{ {
int32 result; int32 result;
if (!PointerIsValid(num)) if (!num)
elog(ERROR, "dtoi4: unable to convert null"); return 0; /* fmgr will return NULL anyway */
if ((*num < INT_MIN) || (*num > INT_MAX)) if ((*num < INT_MIN) || (*num > INT_MAX))
elog(ERROR, "dtoi4: integer out of range"); elog(ERROR, "dtoi4: integer out of range");
@ -849,8 +849,8 @@ dtoi2(float64 num)
{ {
int16 result; int16 result;
if (!PointerIsValid(num)) if (!num)
elog(ERROR, "dtoi2: unable to convert null"); return 0; /* fmgr will return NULL anyway */
if ((*num < SHRT_MIN) || (*num > SHRT_MAX)) if ((*num < SHRT_MIN) || (*num > SHRT_MAX))
elog(ERROR, "dtoi2: integer out of range"); elog(ERROR, "dtoi2: integer out of range");
@ -898,8 +898,8 @@ ftoi4(float32 num)
{ {
int32 result; int32 result;
if (!PointerIsValid(num)) if (!num)
elog(ERROR, "ftoi4: unable to convert null"); return 0; /* fmgr will return NULL anyway */
if ((*num < INT_MIN) || (*num > INT_MAX)) if ((*num < INT_MIN) || (*num > INT_MAX))
elog(ERROR, "ftoi4: integer out of range"); elog(ERROR, "ftoi4: integer out of range");
@ -917,8 +917,8 @@ ftoi2(float32 num)
{ {
int16 result; int16 result;
if (!PointerIsValid(num)) if (!num)
elog(ERROR, "ftoi2: unable to convert null"); return 0; /* fmgr will return NULL anyway */
if ((*num < SHRT_MIN) || (*num > SHRT_MAX)) if ((*num < SHRT_MIN) || (*num > SHRT_MAX))
elog(ERROR, "ftoi2: integer out of range"); elog(ERROR, "ftoi2: integer out of range");