osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Don't use <ctype.h> macros. 

They're locale-dependent (although those *particular* ones might not
be).

Remove no-longer necessary (or not-even-necessary-before-this-change)
includes of <ctype.h>

Change-Id: I1384e3ae4ccba6af9220a08773abcde7ea320573
Reviewed-on: https://code.wireshark.org/review/4755
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2014-10-16 18:26:03 -07:00
parent 359a32f735
commit 0d9b449ae9
4 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
epan/ftypes/ftype-bytes.c
View File

@ -23,7 +23,6 @@
#include <stdio.h>
#include <ftypes-int.h>
#include <string.h>
#include <ctype.h>
#include <epan/addr_resolv.h>
#include <epan/strutil.h>
#include <epan/oids.h>

3
epan/ftypes/ftype-guid.c
View File

@ -22,7 +22,6 @@
#include <string.h>
#include <stdlib.h>
#include <ctype.h>
#include <ftypes-int.h>
#include <epan/guid-utils.h>
@ -53,7 +52,7 @@ get_guid(const char *s, e_guid_t *guid)
return FALSE;
for (i=0; i<n; i++) {
if (fmt[i] == 'X') {
if (!isxdigit((guchar)s[i]))
if (!g_ascii_isxdigit(s[i]))
return FALSE;
} else {
if (s[i] != fmt[i])

1
epan/ftypes/ftype-string.c
View File

@ -27,7 +27,6 @@
#define CMP_MATCHES cmp_matches
#include <ctype.h>
#include <strutil.h>
static void

5
epan/ftypes/ftype-time.c
View File

@ -22,7 +22,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
#include <string.h>
/*
@ -140,7 +139,7 @@ get_nsecs(const char *startp, int *nsecs)
while (p != startp) {
p--;
if (!isdigit((unsigned char)*p)) {
if (!g_ascii_isdigit(*p)) {
/*
* Not a digit - error.
*/
@ -264,7 +263,7 @@ absolute_val_from_string(fvalue_t *fv, const char *s, LogFunc logfunc)
if (*curptr != '.')
goto fail; /* it's not */
curptr++; /* skip the "." */
if (!isdigit((unsigned char)*curptr))
if (!g_ascii_isdigit((unsigned char)*curptr))
goto fail; /* not a digit, so not valid */
if (!get_nsecs(curptr, &fv->value.time.nsecs))
goto fail;