diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-10-17 13:37:11 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-10-17 20:37:42 +0000 |
| commit | 5bfde7c6386b56db80fec85e2ca7dc1d271b461c (patch) | |
| tree | 7a1e391e46bf9720719ed81ea504b193a66901a8 /wiretap/daintree-sna.c | |
| parent | 35a9b9813879fff308c838f8a4351abfeafa8a4a (diff) | |
| download | wireshark-5bfde7c6386b56db80fec85e2ca7dc1d271b461c.tar.gz | |
Don't use ctype.h routines.
That avoids locale dependency and handles possibly-signed chars (which
we weren't doing before).
Change-Id: I70f3d993c9a8fbf870901f12b430d733968c3fa8
Reviewed-on: https://code.wireshark.org/review/4781
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap/daintree-sna.c')
| -rw-r--r-- | wiretap/daintree-sna.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/wiretap/daintree-sna.c b/wiretap/daintree-sna.c index eeddbc800f..555a054d0d 100644 --- a/wiretap/daintree-sna.c +++ b/wiretap/daintree-sna.c @@ -51,7 +51,6 @@ #include <stdlib.h> #include <errno.h> #include <string.h> -#include <ctype.h> #include "wtap.h" #include "wtap-int.h" @@ -237,28 +236,28 @@ daintree_sna_process_hex_data(struct wtap_pkthdr *phdr, Buffer *buf, /* convert hex string to guint8 */ while(*str) { /* most significant nibble */ - if (!isxdigit((guchar)*str)) { + if (!g_ascii_isxdigit(*str)) { *err = WTAP_ERR_BAD_FILE; *err_info = g_strdup("daintree_sna: non-hex digit in hex data"); return FALSE; } - if(isdigit((guchar)*str)) { + if(g_ascii_isdigit(*str)) { *p = (*str - '0') << 4; } else { - *p = ((tolower(*str) - 'a') + 10) << 4; + *p = ((g_ascii_tolower(*str) - 'a') + 10) << 4; } str++; /* least significant nibble */ - if (!isxdigit((guchar)*str)) { + if (!g_ascii_isxdigit(*str)) { *err = WTAP_ERR_BAD_FILE; *err_info = g_strdup("daintree_sna: non-hex digit in hex data"); return FALSE; } - if(isdigit((guchar)*str)) { + if(g_ascii_isdigit(*str)) { *p += *str - '0'; } else { - *p += (tolower(*str) - 'a') + 10; + *p += (g_ascii_tolower(*str) - 'a') + 10; } str++; |