diff options
author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-12-21 15:12:11 +0000 |
---|---|---|
committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-12-21 15:12:11 +0000 |
commit | 33ef0c2600a986e8094caa266873d48c5899dece (patch) | |
tree | 84054c0c44c3eb5158681b39a8655cb205c9d974 | |
parent | 746ee39329954d5bca8d62736844bc17b1d0516c (diff) | |
download | wireshark-33ef0c2600a986e8094caa266873d48c5899dece.tar.gz |
isascii(x) && isprint(x) -> g_ascii_isprint(x)
svn path=/trunk/; revision=54328
-rw-r--r-- | asn1/ldap/packet-ldap-template.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-ldap.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-ositp.c | 2 | ||||
-rw-r--r-- | epan/strutil.c | 4 | ||||
-rw-r--r-- | ui/gtk/main.c | 4 | ||||
-rw-r--r-- | wiretap/k12.c | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/asn1/ldap/packet-ldap-template.c b/asn1/ldap/packet-ldap-template.c index dd6eb1faff..eda70c49a8 100644 --- a/asn1/ldap/packet-ldap-template.c +++ b/asn1/ldap/packet-ldap-template.c @@ -681,7 +681,7 @@ dissect_ldap_AssertionValue(gboolean implicit_tag, tvbuff_t *tvb, int offset, as str=tvb_get_ptr(tvb, offset, len); is_ascii=TRUE; for(i=0;i<len;i++){ - if(!isascii(str[i]) || !isprint(str[i])){ + if(!g_ascii_isprint(str[i])){ is_ascii=FALSE; break; } diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c index c2ab579eab..e8d0130010 100644 --- a/epan/dissectors/packet-ldap.c +++ b/epan/dissectors/packet-ldap.c @@ -899,7 +899,7 @@ dissect_ldap_AssertionValue(gboolean implicit_tag, tvbuff_t *tvb, int offset, as str=tvb_get_ptr(tvb, offset, len); is_ascii=TRUE; for(i=0;i<len;i++){ - if(!isascii(str[i]) || !isprint(str[i])){ + if(!g_ascii_isprint(str[i])){ is_ascii=FALSE; break; } diff --git a/epan/dissectors/packet-ositp.c b/epan/dissectors/packet-ositp.c index e4759b8a8f..17ec4c2059 100644 --- a/epan/dissectors/packet-ositp.c +++ b/epan/dissectors/packet-ositp.c @@ -346,7 +346,7 @@ static gboolean is_all_printable(const guchar *stringtocheck, int length) allprintable=TRUE; for (i=0;i<length;i++) { - if (!(isascii(stringtocheck[i]) && isprint(stringtocheck[i]))) { + if (!g_ascii_isprint(stringtocheck[i])) { allprintable=FALSE; break; } diff --git a/epan/strutil.c b/epan/strutil.c index 9d6ff84e32..e0c3a7610a 100644 --- a/epan/strutil.c +++ b/epan/strutil.c @@ -565,7 +565,7 @@ uri_str_to_bytes(const char *uri_str, GByteArray *bytes) { p = (const guchar *)uri_str; while (*p) { - if (! isascii(*p) || ! g_ascii_isprint(*p)) + if (!g_ascii_isprint(*p)) return FALSE; if (*p == '%') { p++; @@ -636,7 +636,7 @@ format_uri(const GByteArray *bytes, const gchar *reserved_chars) } c = bytes->data[column]; - if (!isascii(c) || !g_ascii_isprint(c) || c == '%') { + if (!g_ascii_isprint(c) || c == '%') { is_reserved = TRUE; } diff --git a/ui/gtk/main.c b/ui/gtk/main.c index 98fd1c5291..f590402d51 100644 --- a/ui/gtk/main.c +++ b/ui/gtk/main.c @@ -3686,10 +3686,10 @@ top_level_key_pressed_cb(GtkWidget *w _U_, GdkEventKey *event, gpointer user_dat /* * A comment in gdkkeysyms.h says that it's autogenerated from * freedesktop.org/x.org's keysymdef.h. Although the GDK docs - * don't explicitly say so, isprint() should work as expected + * don't explicitly say so, g_ascii_isprint() should work as expected * for values < 127. */ - } else if (isascii(event->keyval) && isprint(event->keyval)) { + } else if (g_ascii_isprint(event->keyval)) { /* Forward the keypress on to the display filter entry */ if (main_display_filter_widget && !gtk_widget_is_focus(main_display_filter_widget)) { gtk_window_set_focus(GTK_WINDOW(top_level), main_display_filter_widget); diff --git a/wiretap/k12.c b/wiretap/k12.c index 67d2139463..cb9e22e5cb 100644 --- a/wiretap/k12.c +++ b/wiretap/k12.c @@ -116,7 +116,7 @@ void k12_hex_ascii_dump(guint level, gint64 offset, const char* label, const uns fprintf(dbg_out, " "); for (j=0; j<16; j++) { if ((i+j)<len) - fprintf(dbg_out, "%c", isascii(b[i+j]) && isprint(b[i+j]) ? b[i+j] : '.'); + fprintf(dbg_out, "%c", g_ascii_isprint(b[i+j]) ? b[i+j] : '.'); } fprintf(dbg_out,"\n"); } |