g_ascii_strtoull() is in GLib 2.2 and later, and we require GLib 2.4 or
later, so there's no longer any need to have our own g_ascii_strtoull. svn path=/trunk/; revision=25423
This commit is contained in:
parent
9fb914942a
commit
160a305efa
22
configure.in
22
configure.in
|
@ -1280,28 +1280,6 @@ fi
|
||||||
AC_SUBST(MKSTEMP_C)
|
AC_SUBST(MKSTEMP_C)
|
||||||
AC_SUBST(MKSTEMP_O)
|
AC_SUBST(MKSTEMP_O)
|
||||||
|
|
||||||
ac_save_LIBS="$LIBS"
|
|
||||||
LIBS="$GLIB_LIBS $LIBS"
|
|
||||||
G_ASCII_STRTOULL_C=""
|
|
||||||
G_ASCII_STRTOULL_O=""
|
|
||||||
G_ASCII_STRTOULL_LO=""
|
|
||||||
AC_CHECK_FUNC(g_ascii_strtoull,
|
|
||||||
[G_ASCII_STRTOULL_O=""
|
|
||||||
G_ASCII_STRTOULL_LO=""],
|
|
||||||
[G_ASCII_STRTOULL_O="g_ascii_strtoull.o"
|
|
||||||
G_ASCII_STRTOULL_LO="g_ascii_strtoull.lo"
|
|
||||||
AC_DEFINE(NEED_G_ASCII_STRTOULL_H, 1, [Define if g_ascii_strtoull.h needs to be included])
|
|
||||||
])
|
|
||||||
LIBS="$ac_save_LIBS"
|
|
||||||
if test "$ac_cv_func_g_ascii_strtoull" = no ; then
|
|
||||||
G_ASCII_STRTOULL_C="g_ascii_strtoull.c"
|
|
||||||
G_ASCII_STRTOULL_O="g_ascii_strtoull.o"
|
|
||||||
G_ASCII_STRTOULL_LO="g_ascii_strtoull.lo"
|
|
||||||
fi
|
|
||||||
AC_SUBST(G_ASCII_STRTOULL_C)
|
|
||||||
AC_SUBST(G_ASCII_STRTOULL_O)
|
|
||||||
AC_SUBST(G_ASCII_STRTOULL_LO)
|
|
||||||
|
|
||||||
AC_CHECK_FUNC(inet_aton,
|
AC_CHECK_FUNC(inet_aton,
|
||||||
[INET_ATON_O=""
|
[INET_ATON_O=""
|
||||||
INET_ATON_LO=""],
|
INET_ATON_LO=""],
|
||||||
|
|
|
@ -76,8 +76,6 @@ libwireshark_asmopt_la_SOURCES = \
|
||||||
asm_utils_win32_x86.asm
|
asm_utils_win32_x86.asm
|
||||||
|
|
||||||
EXTRA_libwireshark_la_SOURCES = \
|
EXTRA_libwireshark_la_SOURCES = \
|
||||||
g_ascii_strtoull.c \
|
|
||||||
g_ascii_strtoull.h \
|
|
||||||
inet_aton.c \
|
inet_aton.c \
|
||||||
inet_aton.h
|
inet_aton.h
|
||||||
|
|
||||||
|
|
|
@ -29,10 +29,6 @@
|
||||||
#include "ftypes-int.h"
|
#include "ftypes-int.h"
|
||||||
#include <epan/addr_resolv.h>
|
#include <epan/addr_resolv.h>
|
||||||
|
|
||||||
#ifdef NEED_G_ASCII_STRTOULL_H
|
|
||||||
#include "g_ascii_strtoull.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
int_fvalue_new(fvalue_t *fv)
|
int_fvalue_new(fvalue_t *fv)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,197 +0,0 @@
|
||||||
/* GLIB - Library of useful routines for C programming
|
|
||||||
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
|
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation; either
|
|
||||||
* version 2 of the License, or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This library 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
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the
|
|
||||||
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
||||||
* Boston, MA 02111-1307, USA.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Modified by the GLib Team and others 1997-2000. See the AUTHORS
|
|
||||||
* file for a list of people on the GLib Team. See the ChangeLog
|
|
||||||
* files for a list of changes. These files are distributed with
|
|
||||||
* GLib at ftp://ftp.gtk.org/pub/gtk/.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
* $Id$
|
|
||||||
*
|
|
||||||
* "g_ascii_strtoull()" extracted from GLib 2.4.5, for use with GLibs
|
|
||||||
* that don't have it (e.g., GLib 1.2[.x]).
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
* MT safe
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <errno.h>
|
|
||||||
|
|
||||||
#include <glib.h>
|
|
||||||
|
|
||||||
#include "g_ascii_strtoull.h"
|
|
||||||
|
|
||||||
#ifndef G_MAXUINT64
|
|
||||||
#define G_MAXUINT64 ((guint64)G_GINT64_CONSTANT(0xFFFFFFFFFFFFFFFFU))
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/**
|
|
||||||
* g_ascii_strtoull:
|
|
||||||
* @nptr: the string to convert to a numeric value.
|
|
||||||
* @endptr: if non-%NULL, it returns the character after
|
|
||||||
* the last character used in the conversion.
|
|
||||||
* @base: to be used for the conversion, 2..36 or 0
|
|
||||||
*
|
|
||||||
* Converts a string to a #guint64 value.
|
|
||||||
* This function behaves like the standard strtoull() function
|
|
||||||
* does in the C locale. It does this without actually
|
|
||||||
* changing the current locale, since that would not be
|
|
||||||
* thread-safe.
|
|
||||||
*
|
|
||||||
* This function is typically used when reading configuration
|
|
||||||
* files or other non-user input that should be locale independent.
|
|
||||||
* To handle input from the user you should normally use the
|
|
||||||
* locale-sensitive system strtoull() function.
|
|
||||||
*
|
|
||||||
* If the correct value would cause overflow, %G_MAXUINT64
|
|
||||||
* is returned, and %ERANGE is stored in %errno.
|
|
||||||
*
|
|
||||||
* Return value: the #guint64 value.
|
|
||||||
*
|
|
||||||
* Since: 2.2
|
|
||||||
**/
|
|
||||||
guint64
|
|
||||||
g_ascii_strtoull (const gchar *nptr,
|
|
||||||
gchar **endptr,
|
|
||||||
guint base)
|
|
||||||
{
|
|
||||||
/* this code is based on on the strtol(3) code from GNU libc released under
|
|
||||||
* the GNU Lesser General Public License.
|
|
||||||
*
|
|
||||||
* Copyright (C) 1991,92,94,95,96,97,98,99,2000,01,02
|
|
||||||
* Free Software Foundation, Inc.
|
|
||||||
*/
|
|
||||||
#define ISSPACE(c) ((c) == ' ' || (c) == '\f' || (c) == '\n' || \
|
|
||||||
(c) == '\r' || (c) == '\t' || (c) == '\v')
|
|
||||||
#define ISUPPER(c) ((c) >= 'A' && (c) <= 'Z')
|
|
||||||
#define ISLOWER(c) ((c) >= 'a' && (c) <= 'z')
|
|
||||||
#define ISALPHA(c) (ISUPPER (c) || ISLOWER (c))
|
|
||||||
#define TOUPPER(c) (ISLOWER (c) ? (c) - 'a' + 'A' : (c))
|
|
||||||
#define TOLOWER(c) (ISUPPER (c) ? (c) - 'A' + 'a' : (c))
|
|
||||||
gboolean negative, overflow;
|
|
||||||
guint64 cutoff;
|
|
||||||
guint64 cutlim;
|
|
||||||
guint64 ui64;
|
|
||||||
const gchar *s, *save;
|
|
||||||
guchar c;
|
|
||||||
|
|
||||||
if (base == 1 || base > 36)
|
|
||||||
{
|
|
||||||
errno = EINVAL;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
save = s = nptr;
|
|
||||||
|
|
||||||
/* Skip white space. */
|
|
||||||
while (ISSPACE (*s))
|
|
||||||
++s;
|
|
||||||
if (!*s)
|
|
||||||
goto noconv;
|
|
||||||
|
|
||||||
/* Check for a sign. */
|
|
||||||
negative = FALSE;
|
|
||||||
if (*s == '-')
|
|
||||||
{
|
|
||||||
negative = TRUE;
|
|
||||||
++s;
|
|
||||||
}
|
|
||||||
else if (*s == '+')
|
|
||||||
++s;
|
|
||||||
|
|
||||||
/* Recognize number prefix and if BASE is zero, figure it out ourselves. */
|
|
||||||
if (*s == '0')
|
|
||||||
{
|
|
||||||
if ((base == 0 || base == 16) && TOUPPER (s[1]) == 'X')
|
|
||||||
{
|
|
||||||
s += 2;
|
|
||||||
base = 16;
|
|
||||||
}
|
|
||||||
else if (base == 0)
|
|
||||||
base = 8;
|
|
||||||
}
|
|
||||||
else if (base == 0)
|
|
||||||
base = 10;
|
|
||||||
|
|
||||||
/* Save the pointer so we can check later if anything happened. */
|
|
||||||
save = s;
|
|
||||||
cutoff = G_MAXUINT64 / base;
|
|
||||||
cutlim = G_MAXUINT64 % base;
|
|
||||||
|
|
||||||
overflow = FALSE;
|
|
||||||
ui64 = 0;
|
|
||||||
c = *s;
|
|
||||||
for (; c; c = *++s)
|
|
||||||
{
|
|
||||||
if (c >= '0' && c <= '9')
|
|
||||||
c -= '0';
|
|
||||||
else if (ISALPHA (c))
|
|
||||||
c = TOUPPER (c) - 'A' + 10;
|
|
||||||
else
|
|
||||||
break;
|
|
||||||
if (c >= base)
|
|
||||||
break;
|
|
||||||
/* Check for overflow. */
|
|
||||||
if (ui64 > cutoff || (ui64 == cutoff && c > cutlim))
|
|
||||||
overflow = TRUE;
|
|
||||||
else
|
|
||||||
{
|
|
||||||
ui64 *= base;
|
|
||||||
ui64 += c;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Check if anything actually happened. */
|
|
||||||
if (s == save)
|
|
||||||
goto noconv;
|
|
||||||
|
|
||||||
/* Store in ENDPTR the address of one character
|
|
||||||
past the last character we converted. */
|
|
||||||
if (endptr)
|
|
||||||
*endptr = (gchar*) s;
|
|
||||||
|
|
||||||
if (overflow)
|
|
||||||
{
|
|
||||||
errno = ERANGE;
|
|
||||||
return G_MAXUINT64;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Return the result of the appropriate sign. */
|
|
||||||
return negative ? -ui64 : ui64;
|
|
||||||
|
|
||||||
noconv:
|
|
||||||
/* We must handle a special case here: the base is 0 or 16 and the
|
|
||||||
first two characters are '0' and 'x', but the rest are no
|
|
||||||
hexadecimal digits. This is no error case. We return 0 and
|
|
||||||
ENDPTR points to the `x`. */
|
|
||||||
if (endptr)
|
|
||||||
{
|
|
||||||
if (save - nptr >= 2 && TOUPPER (save[-1]) == 'X'
|
|
||||||
&& save[-2] == '0')
|
|
||||||
*endptr = (gchar*) &save[-1];
|
|
||||||
else
|
|
||||||
/* There was no number to convert. */
|
|
||||||
*endptr = (gchar*) nptr;
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
|
@ -1,15 +0,0 @@
|
||||||
/*
|
|
||||||
* $Id$
|
|
||||||
*
|
|
||||||
* "g_ascii_strtoull()" extracted from GLib 2.4.5, for use with GLibs
|
|
||||||
* that don't have it (e.g., GLib 1.2[.x]).
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef __WIRESHARK_G_ASCII_STRTOULL_H__
|
|
||||||
#define __WIRESHARK_G_ASCII_STRTOULL_H__
|
|
||||||
|
|
||||||
extern guint64 g_ascii_strtoull (const gchar *nptr,
|
|
||||||
gchar **endptr,
|
|
||||||
guint base);
|
|
||||||
|
|
||||||
#endif
|
|
Loading…
Reference in New Issue