diff options
-rw-r--r-- | capture_sync.c | 6 | ||||
-rw-r--r-- | wsutil/str_util.c | 2 | ||||
-rw-r--r-- | wsutil/str_util.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/capture_sync.c b/capture_sync.c index d3de9994cd..a5ff336cb4 100644 --- a/capture_sync.c +++ b/capture_sync.c @@ -114,7 +114,7 @@ static const char *sync_pipe_signame(int); static gboolean sync_pipe_input_cb(gint source, gpointer user_data); static int sync_pipe_wait_for_child(int fork_child, gchar **msgp); -static void pipe_convert_header(const guchar *header, int header_len, char *indicator, int *block_len); +static void pipe_convert_header(const gchar *header, int header_len, char *indicator, int *block_len); static ssize_t pipe_read_block(int pipe_fd, char *indicator, int len, char *msg, char **err_msg); @@ -1514,7 +1514,7 @@ sync_pipe_gets_nonblock(int pipe_fd, char *bytes, int max) { /* convert header values (indicator and 3-byte length) */ static void -pipe_convert_header(const guchar *header, int header_len, char *indicator, int *block_len) { +pipe_convert_header(const gchar *header, int header_len, char *indicator, int *block_len) { g_assert(header_len == 4); @@ -1532,7 +1532,7 @@ pipe_read_block(int pipe_fd, char *indicator, int len, char *msg, { int required; ssize_t newly; - guchar header[4]; + gchar header[4]; /* read header (indicator and 3-byte length) */ newly = pipe_read_bytes(pipe_fd, header, 4, err_msg); diff --git a/wsutil/str_util.c b/wsutil/str_util.c index 42934597e3..9f8cac5320 100644 --- a/wsutil/str_util.c +++ b/wsutil/str_util.c @@ -55,7 +55,7 @@ ascii_strup_inplace(gchar *str) /* Check if an entire string is printable. */ gboolean -isprint_string(const guchar *str) +isprint_string(const gchar *str) { guint pos; diff --git a/wsutil/str_util.h b/wsutil/str_util.h index 10d7e9025c..7fc189b0cc 100644 --- a/wsutil/str_util.h +++ b/wsutil/str_util.h @@ -68,7 +68,7 @@ gchar *ascii_strup_inplace(gchar *str); * @param str The string to be checked * @return TRUE if the entire string is printable, otherwise FALSE */ -gboolean isprint_string(const guchar *string); +gboolean isprint_string(const gchar *string); /** Check if an entire string consists of digits * |