aboutsummaryrefslogtreecommitdiffstats
path: root/capture_sync.c
diff options
context:
space:
mode:
authorEvan Huus <eapache@gmail.com>2012-12-26 13:41:30 +0000
committerEvan Huus <eapache@gmail.com>2012-12-26 13:41:30 +0000
commitc2945ff831a1587e3e18cd8b9c297d20b171e55a (patch)
treea0f21dac4f4161ca669967737b28fba23cc0f756 /capture_sync.c
parent1fafe099ab2a54349f706630f36e27274f4682b9 (diff)
Squash some sign-conversion warnings that g++ picks up but gcc does
not. QtShark now builds warning-free (for me at least). svn path=/trunk/; revision=46786
Diffstat (limited to 'capture_sync.c')
-rw-r--r--capture_sync.c6
1 files changed, 3 insertions, 3 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);