forked from osmocom/wireshark
wsutil: add string to integer conversion utilities.
In the current code many functions have been used for convertion (strtol, atoi, g_ascii_strtoll, etc). Those utilities want to be the only, shared, way to convert integers. Change-Id: I22ba1bf54e144e73a4728612a4437de5a2d339e2 Reviewed-on: https://code.wireshark.org/review/17414 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Dario Lombardo <lomato@gmail.com>
This commit is contained in:
Dario Lombardo
parent
87519e4c06
commit
ba981aced8
|
|
@ -60,6 +60,7 @@ set(WSUTIL_COMMON_FILES
|
|||
sober128.c
|
||||
strnatcmp.c
|
||||
str_util.c
|
||||
strtoi.c
|
||||
rc4.c
|
||||
report_err.c
|
||||
tempfile.c
|
||||
|
|
|
|||
|
|
@ -82,6 +82,7 @@ libwsutil_nonrepl_INCLUDES = \
|
|||
sober128.h \
|
||||
str_util.h \
|
||||
strnatcmp.h \
|
||||
strtoi.h \
|
||||
tempfile.h \
|
||||
time_util.h \
|
||||
type_util.h \
|
||||
|
|
@ -150,6 +151,7 @@ libwsutil_la_SOURCES = \
|
|||
sha2.c \
|
||||
sober128.c \
|
||||
str_util.c \
|
||||
strtoi.c \
|
||||
strnatcmp.c \
|
||||
tempfile.c \
|
||||
time_util.c \
|
||||
|
|
|
|||
|
|
@ -0,0 +1,122 @@
|
|||
/* strtoi.c
|
||||
* Utilities to convert strings to integers
|
||||
*
|
||||
* Copyright 2016, Dario Lombardo
|
||||
*
|
||||
* Wireshark - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@wireshark.org>
|
||||
* Copyright 1998 Gerald Combs
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#include "strtoi.h"
|
||||
#include <errno.h>
|
||||
|
||||
gboolean ws_strtoi64(const gchar* str, gint64* cint)
|
||||
{
|
||||
gchar* endptr;
|
||||
gint64 val;
|
||||
|
||||
errno = 0;
|
||||
val = g_ascii_strtoll(str, &endptr, 10);
|
||||
if ((val == 0 && endptr == str) || (*endptr != 0)) {
|
||||
*cint = 0;
|
||||
errno = EINVAL;
|
||||
return FALSE;
|
||||
}
|
||||
if ((val == G_MAXINT64 || val == G_MININT64) && errno == ERANGE) {
|
||||
*cint = 0;
|
||||
/* errno is already set */
|
||||
return FALSE;
|
||||
}
|
||||
*cint = val;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
gboolean ws_strtou64(const gchar* str, guint64* cint)
|
||||
{
|
||||
gchar* endptr;
|
||||
guint64 val;
|
||||
|
||||
errno = 0;
|
||||
val = g_ascii_strtoull(str, &endptr, 10);
|
||||
if ((val == 0 && endptr == str) || (*endptr != 0)) {
|
||||
*cint = 0;
|
||||
errno = EINVAL;
|
||||
return FALSE;
|
||||
}
|
||||
if (val == G_MAXUINT64 && errno == ERANGE) {
|
||||
*cint = 0;
|
||||
return FALSE;
|
||||
}
|
||||
*cint = val;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
#define DEFINE_WS_STRTOI_BITS(bits) \
|
||||
gboolean ws_strtoi##bits(const gchar* str, gint##bits* cint) \
|
||||
{ \
|
||||
gint64 val; \
|
||||
if (!ws_strtoi64(str, &val)) { \
|
||||
return FALSE; \
|
||||
} \
|
||||
if (val < G_MININT##bits || val > G_MAXINT##bits) { \
|
||||
*cint = 0; \
|
||||
errno = ERANGE; \
|
||||
return FALSE; \
|
||||
} \
|
||||
*cint = (gint##bits)val; \
|
||||
return TRUE; \
|
||||
}
|
||||
|
||||
DEFINE_WS_STRTOI_BITS(32);
|
||||
DEFINE_WS_STRTOI_BITS(16);
|
||||
DEFINE_WS_STRTOI_BITS(8);
|
||||
|
||||
#define DEFINE_WS_STRTOU_BITS(bits) \
|
||||
int ws_strtou##bits(const gchar* str, guint##bits* cint) \
|
||||
{ \
|
||||
guint64 val; \
|
||||
if (!ws_strtou64(str, &val)) { \
|
||||
return FALSE; \
|
||||
} \
|
||||
if (val > G_MAXUINT##bits) { \
|
||||
*cint = 0; \
|
||||
errno = ERANGE; \
|
||||
return FALSE; \
|
||||
} \
|
||||
*cint = (guint##bits)val; \
|
||||
return TRUE; \
|
||||
}
|
||||
|
||||
DEFINE_WS_STRTOU_BITS(32);
|
||||
DEFINE_WS_STRTOU_BITS(16);
|
||||
DEFINE_WS_STRTOU_BITS(8);
|
||||
|
||||
/*
|
||||
* Editor modelines - https://www.wireshark.org/tools/modelines.html
|
||||
*
|
||||
* Local variables:
|
||||
* c-basic-offset: 4
|
||||
* tab-width: 8
|
||||
* indent-tabs-mode: t
|
||||
* End:
|
||||
*
|
||||
* vi: set shiftwidth=4 tabstop=8 noexpandtab:
|
||||
* :indentSize=4:tabSize=8:noTabs=false:
|
||||
*/
|
||||
|
|
@ -0,0 +1,63 @@
|
|||
/* strtoi.h
|
||||
* Utilities to convert strings to integers
|
||||
*
|
||||
* Copyright 2016, Dario Lombardo
|
||||
*
|
||||
* Wireshark - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@wireshark.org>
|
||||
* Copyright 1998 Gerald Combs
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
#ifndef _WS_STRTOI_H
|
||||
#define _WS_STRTOI_H
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
#include "ws_symbol_export.h"
|
||||
|
||||
/*
|
||||
* \brief Convert a string to a signed/unsigned int, with error checks.
|
||||
* \param str The string to convert
|
||||
* \param cint The converted integer
|
||||
* \return TRUE if the conversion suceeds, FALSE otherwise.
|
||||
* On error, errno is set to EINVAL for unrecognized input and ERANGE
|
||||
* if the resulting number does not fit in the type.
|
||||
*/
|
||||
WS_DLL_PUBLIC gboolean ws_strtoi64(const gchar* str, gint64* cint);
|
||||
WS_DLL_PUBLIC gboolean ws_strtoi32(const gchar* str, gint32* cint);
|
||||
WS_DLL_PUBLIC gboolean ws_strtoi16(const gchar* str, gint16* cint);
|
||||
WS_DLL_PUBLIC gboolean ws_strtoi8 (const gchar* str, gint8* cint);
|
||||
|
||||
WS_DLL_PUBLIC gboolean ws_strtou64(const gchar* str, guint64* cint);
|
||||
WS_DLL_PUBLIC gboolean ws_strtou32(const gchar* str, guint32* cint);
|
||||
WS_DLL_PUBLIC gboolean ws_strtou16(const gchar* str, guint16* cint);
|
||||
WS_DLL_PUBLIC gboolean ws_strtou8 (const gchar* str, guint8* cint);
|
||||
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Editor modelines - https://www.wireshark.org/tools/modelines.html
|
||||
*
|
||||
* Local variables:
|
||||
* c-basic-offset: 4
|
||||
* tab-width: 8
|
||||
* indent-tabs-mode: t
|
||||
* End:
|
||||
*
|
||||
* vi: set shiftwidth=4 tabstop=8 noexpandtab:
|
||||
* :indentSize=4:tabSize=8:noTabs=false:
|
||||
*/
|
||||
Loading…
Reference in New Issue