From d33f1d9e4284b9295ca2102731937841a3bb242a Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Sat, 1 Oct 2005 19:51:27 +0000 Subject: [PATCH] 2005-10-01 Marcus Brinkmann * assuan-client.c (assuan_transact): Change LINE, S and D from unsigned char * to char * to silence gcc warning. * assuan-util.c (_assuan_log_sanitized_string): Add explicit cast to silence gcc warning. * assuan-inquire.c (assuan_inquire): Likewise. --- trunk/assuan/ChangeLog | 8 ++++++++ trunk/assuan/assuan-client.c | 6 +++--- trunk/assuan/assuan-inquire.c | 4 ++-- trunk/assuan/assuan-util.c | 2 +- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/trunk/assuan/ChangeLog b/trunk/assuan/ChangeLog index 1627e4a..4f83552 100644 --- a/trunk/assuan/ChangeLog +++ b/trunk/assuan/ChangeLog @@ -1,3 +1,11 @@ +2005-10-01 Marcus Brinkmann + + * assuan-client.c (assuan_transact): Change LINE, S and D from + unsigned char * to char * to silence gcc warning. + * assuan-util.c (_assuan_log_sanitized_string): Add explicit cast + to silence gcc warning. + * assuan-inquire.c (assuan_inquire): Likewise. + 2005-08-19 Werner Koch * funopen.c, assuan-socket.c: Copied from libassuan CVS. diff --git a/trunk/assuan/assuan-client.c b/trunk/assuan/assuan-client.c index a218994..2f78d0c 100644 --- a/trunk/assuan/assuan-client.c +++ b/trunk/assuan/assuan-client.c @@ -1,5 +1,5 @@ /* assuan-client.c - client functions - * Copyright (C) 2001, 2002 Free Software Foundation, Inc. + * Copyright (C) 2001, 2002, 2005 Free Software Foundation, Inc. * * This file is part of Assuan. * @@ -137,7 +137,7 @@ assuan_transact (ASSUAN_CONTEXT ctx, void *status_cb_arg) { int rc, okay, off; - unsigned char *line; + char *line; int linelen; rc = assuan_write_line (ctx, command); @@ -167,7 +167,7 @@ assuan_transact (ASSUAN_CONTEXT ctx, rc = ASSUAN_No_Data_Callback; else { - unsigned char *s, *d; + char *s, *d; for (s=d=line; linelen; linelen--) { diff --git a/trunk/assuan/assuan-inquire.c b/trunk/assuan/assuan-inquire.c index 8d034ca..0547aae 100644 --- a/trunk/assuan/assuan-inquire.c +++ b/trunk/assuan/assuan-inquire.c @@ -1,5 +1,5 @@ /* assuan-inquire.c - handle inquire stuff - * Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. + * Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. * * This file is part of Assuan. * @@ -173,7 +173,7 @@ assuan_inquire (assuan_context_t ctx, const char *keyword, rc = _assuan_read_line (ctx); if (rc) goto leave; - line = ctx->inbound.line; + line = (unsigned char *) ctx->inbound.line; linelen = ctx->inbound.linelen; } while (*line == '#' || !linelen); diff --git a/trunk/assuan/assuan-util.c b/trunk/assuan/assuan-util.c index 7f442e9..2c2f744 100644 --- a/trunk/assuan/assuan-util.c +++ b/trunk/assuan/assuan-util.c @@ -202,7 +202,7 @@ _assuan_log_print_buffer (FILE *fp, const void *buffer, size_t length) void _assuan_log_sanitized_string (const char *string) { - const unsigned char *s = string; + const unsigned char *s = (const unsigned char *) string; FILE *fp = assuan_get_assuan_log_stream (); if (! *s) -- 2.26.2