database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-01 21:31:19 +03:00
Code Activity

Move strtoint() to common

Browse Source 
Several places used similar code to convert a string to an int, so take
the function that we already had and make it globally available.

Reviewed-by: Michael Paquier <michael@paquier.xyz>
This commit is contained in:
Peter Eisentraut
2018-03-13 10:21:09 -04:00
parent 6cf86f4354
commit 17bb625017
9 changed files with 39 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/backend/nodes/read.c
View File

@@ -21,6 +21,7 @@
#include <ctype.h>
#include "common/string.h"
#include "nodes/pg_list.h"
#include "nodes/readfuncs.h"
#include "nodes/value.h"
@@ -215,18 +216,15 @@ nodeTokenType(char *token, int length)
{
/*
* Yes. Figure out whether it is integral or float; this requires
* both a syntax check and a range check. strtol() can do both for us.
* We know the token will end at a character that strtol will stop at,
* both a syntax check and a range check. strtoint() can do both for us.
* We know the token will end at a character that strtoint will stop at,
* so we do not need to modify the string.
*/
long val;
char *endptr;
errno = 0;
val = strtol(token, &endptr, 10);
if (endptr != token + length || errno == ERANGE ||
/* check for overflow of int */
val != (int) val)
(void) strtoint(token, &endptr, 10);
if (endptr != token + length || errno == ERANGE)
return T_Float;
return T_Integer;
}