forked from osmocom/wireshark
Don't use <ctype.h> macros, and eliminate an include of <ctype.h>.
This avoids locale-dependent tests, and fixes cases where we passed signed char values to those macros (which is not safe with char being signed, as it is on most, but not all, platforms). Change-Id: Iea962cd7e4dfaf33c3c873ba43814cc6ed298d94 Reviewed-on: https://code.wireshark.org/review/4764 Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
parent
23b233d741
commit
63ab36be92
|
@ -38,7 +38,6 @@
|
|||
*/
|
||||
|
||||
#include "config.h"
|
||||
#include <ctype.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
|
@ -781,7 +780,7 @@ dfilter_expr_dlg_accept_cb(GtkWidget *w, gpointer filter_te_arg)
|
|||
*/
|
||||
pos = gtk_editable_get_position(GTK_EDITABLE(filter_te));
|
||||
chars = gtk_editable_get_chars(GTK_EDITABLE(filter_te), pos, pos + 1);
|
||||
if (strcmp(chars, "") != 0 && !isspace((unsigned char)chars[0]))
|
||||
if (strcmp(chars, "") != 0 && !g_ascii_isspace(chars[0]))
|
||||
gtk_editable_insert_text(GTK_EDITABLE(filter_te), " ", 1, &pos);
|
||||
g_free(chars);
|
||||
|
||||
|
@ -844,7 +843,7 @@ dfilter_expr_dlg_accept_cb(GtkWidget *w, gpointer filter_te_arg)
|
|||
g_free(value_str);
|
||||
}
|
||||
chars = gtk_editable_get_chars(GTK_EDITABLE(filter_te), pos + 1, pos + 2);
|
||||
if (strcmp(chars, "") != 0 && !isspace((unsigned char)chars[0]))
|
||||
if (strcmp(chars, "") != 0 && !g_ascii_isspace(chars[0]))
|
||||
gtk_editable_insert_text(GTK_EDITABLE(filter_te), " ", 1, &pos);
|
||||
g_free(chars);
|
||||
|
||||
|
|
|
@ -24,7 +24,6 @@
|
|||
#include "config.h"
|
||||
|
||||
#include <string.h>
|
||||
#include <ctype.h>
|
||||
#include <errno.h>
|
||||
|
||||
#include <glib.h>
|
||||
|
@ -55,7 +54,7 @@ persfilepath_opt(int opt _U_, const char *optstr)
|
|||
* as we allow it in the preferences file, we might as well
|
||||
* allow it here).
|
||||
*/
|
||||
while (isspace((guchar)*p))
|
||||
while (g_ascii_isspace(*p))
|
||||
p++;
|
||||
if (*p == '\0') {
|
||||
/*
|
||||
|
|
|
@ -26,7 +26,6 @@
|
|||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <ctype.h>
|
||||
#include <errno.h>
|
||||
|
||||
#include "capture_opts.h"
|
||||
|
@ -1183,7 +1182,7 @@ recent_set_arg(char *prefarg)
|
|||
* as we allow it in the preferences file, we might as well
|
||||
* allow it here).
|
||||
*/
|
||||
while (isspace((guchar)*p))
|
||||
while (g_ascii_isspace(*p))
|
||||
p++;
|
||||
if (*p == '\0') {
|
||||
/*
|
||||
|
|
|
@ -25,7 +25,6 @@
|
|||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <ctype.h>
|
||||
#include <math.h>
|
||||
|
||||
#include <glib.h>
|
||||
|
@ -138,7 +137,7 @@ time_string_parse(const gchar *time_text, int *year, int *month, int *day, gbool
|
|||
return "Unable to convert time.";
|
||||
|
||||
/* strip whitespace */
|
||||
while (isspace(pts[0]))
|
||||
while (g_ascii_isspace(pts[0]))
|
||||
++pts;
|
||||
|
||||
if (year && month && day) {
|
||||
|
|
Loading…
Reference in New Issue