diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-10-19 23:14:50 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-10-20 06:15:19 +0000 |
| commit | 80e6f6251e96dd7b8a9ab0fdbf63b03a73ef6692 (patch) | |
| tree | 92d519b9b19cccba0d083a6ad20152352daa5924 /epan/dissectors/packet-catapult-dct2000.c | |
| parent | 0b9eb9f4b71b6632cfb4b87bcdefdfa75eaf2dd0 (diff) | |
Get rid of calls to ctype.h functions.
They don't handle values outside the range -1 to 127, and their behavior
is locale-dependent. Use g_ascii_isXXX() and g_ascii_toXXX() instead of
isXXX() and toXXX().
If you're checking for printable ASCII, don't use isascii() and don't
use iscntrl(), use g_ascii_isprint(). If you're checking for graphical
ASCII, i.e. printable ASCII except for a space, use g_ascii_isgraph().
Use ws_xton() to convert a hex digit character to the corresponding
numeric value.
Change-Id: Id3039bc586fbf66d8736c2df248c790c0d7a2330
Reviewed-on: https://code.wireshark.org/review/4851
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-catapult-dct2000.c')
| -rw-r--r-- | epan/dissectors/packet-catapult-dct2000.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c index 30c0d6df95..e947d589b4 100644 --- a/epan/dissectors/packet-catapult-dct2000.c +++ b/epan/dissectors/packet-catapult-dct2000.c @@ -26,7 +26,6 @@ #include <stdio.h> #include <stdlib.h> -#include <ctype.h> #include <epan/packet.h> #include <epan/conversation.h> @@ -1408,7 +1407,7 @@ static void parse_outhdr_string(const guchar *outhdr_string, gint outhdr_string_ /* Find digits */ for ( ; n < outhdr_string_len; n++) { - if (!isdigit(outhdr_string[n])) { + if (!g_ascii_isdigit(outhdr_string[n])) { break; } else { @@ -1922,8 +1921,8 @@ static void dissect_tty_lines(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre /* Extract & add the string. */ char *string = (char*)tvb_get_string_enc(wmem_packet_scope(), tvb, offset, linelen, ENC_ASCII); - if (isascii(string[0])) { - /* If looks printable treat as string... */ + if (g_ascii_isprint(string[0])) { + /* If the first byte of the string is printable ASCII treat as string... */ proto_tree_add_string_format(tty_tree, hf_catapult_dct2000_tty_line, tvb, offset, linelen, string, |