2005-10-01 Marcus Brinkmann <marcus@g10code.de>

	* 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.

diff --git a/assuan/ChangeLog b/assuan/ChangeLog
index 1627e4a1553d017b72c795d7df541c0ef5c26375..4f835521d6ad65b8d6304d512b80cdab106ea3c9 100644 (file)
--- a/assuan/ChangeLog
+++ b/assuan/ChangeLog
@@ -1,3 +1,11 @@
+2005-10-01  Marcus Brinkmann  <marcus@g10code.de>
+
+       * 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  <wk@g10code.com>
 
        * funopen.c, assuan-socket.c: Copied from libassuan CVS.

diff --git a/assuan/assuan-client.c b/assuan/assuan-client.c
index a2189946fdf71befe465d7702d3dff0c3fcc7d67..2f78d0c827248ffe9a6f9fe1f62b183e474693f8 100644 (file)
--- 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 8d034ca51fd867ffdf0268fdcffc2ce723f20283..0547aae318aedcb50343024f5ab41b1c41828721 100644 (file)
--- 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 7f442e93b7d561d6b8fb63efe457fcfc2cbd6a5b..2c2f744d7ac0b7b5b40c447a722f56ac1db541eb 100644 (file)
--- 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)