diff options
author | AndersBroman <anders.broman@ericsson.com> | 2014-05-13 14:44:47 +0200 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2014-05-13 16:14:07 +0000 |
commit | 3157bf6ba5e4896b28316695ecd3a4659631c8c2 (patch) | |
tree | 58a3778203fb4bcb46746532a9adf9a9dd8d0c17 /epan/dissectors | |
parent | f7819de76ab4ccffaa544c46211011f3ade7fede (diff) |
isprint() -> g_ascii_isprint()
Change-Id: Ia586ef8ce500d5fc7578c52014206fa7a7eaea41
Reviewed-on: https://code.wireshark.org/review/1624
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors')
-rw-r--r-- | epan/dissectors/packet-at.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-bjnp.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-ftp.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-osc.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-radius.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-slimp3.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-ssl-utils.c | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/epan/dissectors/packet-at.c b/epan/dissectors/packet-at.c index 760a965fe4..d1516ceecc 100644 --- a/epan/dissectors/packet-at.c +++ b/epan/dissectors/packet-at.c @@ -49,7 +49,7 @@ static gboolean allowed_chars(tvbuff_t *tvb) len = tvb_length(tvb); for (offset = 0; offset < len; offset++) { val = tvb_get_guint8(tvb, offset); - if (!(isprint(val) || (val == 0x0a) || (val == 0x0d))) + if (!(g_ascii_isprint(val) || (val == 0x0a) || (val == 0x0d))) return (FALSE); } return (TRUE); diff --git a/epan/dissectors/packet-bjnp.c b/epan/dissectors/packet-bjnp.c index 8cc676bd9f..b37a3b68f1 100644 --- a/epan/dissectors/packet-bjnp.c +++ b/epan/dissectors/packet-bjnp.c @@ -99,7 +99,7 @@ static int dissect_bjnp (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo gchar *info; /* If it does not start with a printable character it's not BJNP */ - if(!isprint(tvb_get_guint8(tvb, 0))) + if(!g_ascii_isprint(tvb_get_guint8(tvb, 0))) return 0; col_set_str (pinfo->cinfo, COL_PROTOCOL, PSNAME); diff --git a/epan/dissectors/packet-ftp.c b/epan/dissectors/packet-ftp.c index 9b338d1f30..53bc48965a 100644 --- a/epan/dissectors/packet-ftp.c +++ b/epan/dissectors/packet-ftp.c @@ -911,7 +911,7 @@ dissect_ftpdata(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Check the first few chars to see whether it looks like a text file or not */ check_chars = MIN(10, data_length); for (i=0; i < check_chars; i++) { - if (!isprint(tvb_get_guint8(tvb, i))) { + if (!g_ascii_isprint(tvb_get_guint8(tvb, i))) { is_text = FALSE; break; } diff --git a/epan/dissectors/packet-osc.c b/epan/dissectors/packet-osc.c index 39dc1d07e9..eee27fb2e4 100644 --- a/epan/dissectors/packet-osc.c +++ b/epan/dissectors/packet-osc.c @@ -257,7 +257,7 @@ is_valid_path(const char *path) if(path[0] != '/') return FALSE; for(ptr=path+1; *ptr!='\0'; ptr++) - if( (isprint(*ptr) == 0) || (strchr(invalid_path_chars, *ptr) != NULL) ) + if( (g_ascii_isprint(*ptr) == 0) || (strchr(invalid_path_chars, *ptr) != NULL) ) return FALSE; return TRUE; } diff --git a/epan/dissectors/packet-radius.c b/epan/dissectors/packet-radius.c index 414564ba01..9871bdaac3 100644 --- a/epan/dissectors/packet-radius.c +++ b/epan/dissectors/packet-radius.c @@ -578,7 +578,7 @@ radius_decrypt_avp(gchar *dest,int dest_len,tvbuff_t *tvb,int offset,int length) for ( i = 0; i < padded_length; i += AUTHENTICATOR_LENGTH ) { for ( j = 0; j < AUTHENTICATOR_LENGTH; j++ ) { c = pd[i + j] ^ digest[j]; - if ( isprint(c) ) { + if ( g_ascii_isprint(c) ) { returned_length = g_snprintf(&dest[totlen], dest_len - totlen, "%c", c); totlen += MIN(returned_length, dest_len - totlen - 1); diff --git a/epan/dissectors/packet-slimp3.c b/epan/dissectors/packet-slimp3.c index b5fa0577a8..e2558ee70a 100644 --- a/epan/dissectors/packet-slimp3.c +++ b/epan/dissectors/packet-slimp3.c @@ -353,7 +353,7 @@ dissect_slimp3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ break; case 3: lcd_char = tvb_get_guint8(tvb, offset + i1 + 1); - if (!isprint(lcd_char)) + if (!g_ascii_isprint(lcd_char)) lcd_char = '.'; if (ti && in_str) { lcd_strlen += 2; @@ -420,7 +420,7 @@ dissect_slimp3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ (lcd_str[lcd_strlen-1] != ' ') || (tvb_get_guint8(tvb, offset + i1 + 1) != ' ')) { lcd_char = tvb_get_guint8(tvb, offset + i1 + 1); - lcd_str[lcd_strlen++] = isprint(lcd_char) ? lcd_char : '.'; + lcd_str[lcd_strlen++] = g_ascii_isprint(lcd_char) ? lcd_char : '.'; } } } diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c index 248e827e13..28bbeca22c 100644 --- a/epan/dissectors/packet-ssl-utils.c +++ b/epan/dissectors/packet-ssl-utils.c @@ -4650,7 +4650,7 @@ ssl_print_data(const gchar* name, const guchar* data, size_t len) fputc('|', ssl_debug_file); for (j=i, k=0; k<16 && j<len; ++j, ++k) { guchar c = data[j]; - if (!isprint(c) || (c=='\t')) c = '.'; + if (!g_ascii_isprint(c) || (c=='\t')) c = '.'; fputc(c, ssl_debug_file); } for (; k<16; ++k) |