diff options
| -rw-r--r-- | assuan/ChangeLog | 8 | ||||
| -rw-r--r-- | assuan/assuan-client.c | 6 | ||||
| -rw-r--r-- | assuan/assuan-inquire.c | 4 | ||||
| -rw-r--r-- | assuan/assuan-util.c | 2 | 
4 files changed, 14 insertions, 6 deletions
| diff --git a/assuan/ChangeLog b/assuan/ChangeLog index 1627e4a1..4f835521 100644 --- a/assuan/ChangeLog +++ b/assuan/ChangeLog @@ -1,3 +1,11 @@ +2005-10-01  Marcus Brinkmann  <[email protected]> + +	* 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  <[email protected]>  	* funopen.c, assuan-socket.c: Copied from libassuan CVS. diff --git a/assuan/assuan-client.c b/assuan/assuan-client.c index a2189946..2f78d0c8 100644 --- a/assuan/assuan-client.c +++ b/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/assuan/assuan-inquire.c b/assuan/assuan-inquire.c index 8d034ca5..0547aae3 100644 --- a/assuan/assuan-inquire.c +++ b/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/assuan/assuan-util.c b/assuan/assuan-util.c index 7f442e93..2c2f744d 100644 --- a/assuan/assuan-util.c +++ b/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) | 
