2008-11-03 Marcus Brinkmann <[email protected]>

	* tests/fdpassing.c (register_commands): Add missing initializer
	to silence gcc -W warning.

src/
2008-11-03  Marcus Brinkmann  <[email protected]>

	* assuan-handler.c (std_handler_help): Make I unsigned to silence
	gcc -W warning.
	* assuan-logging.c (_assuan_log_print_buffer): Likewise for N.
	* funopen.c (_assuan_funopen): Remove initializer to silence gcc
	-W warning.
	* assuan-handler.c (std_cmd_table): Add missing initializer to
	silence gcc -W warning.
	* assuan-socket-server.c (io): Likewise.
	* assuan-socket-connect.c (assuan_socket_connect_ext): Likewise.

8 files changed, 44 insertions, 27 deletions

diff --git a/ChangeLog b/ChangeLog
index 147bc01..c8137de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-03  Marcus Brinkmann  <[email protected]>
+
+	* tests/fdpassing.c (register_commands): Add missing initializer
+	to silence gcc -W warning.
+
 2008-05-25  Werner Koch  <[email protected]>
 
 	Released 1.0.5.
diff --git a/src/ChangeLog b/src/ChangeLog
index ec6afaf..210b53c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,15 @@
+2008-11-03  Marcus Brinkmann  <[email protected]>
+
+	* assuan-handler.c (std_handler_help): Make I unsigned to silence
+	gcc -W warning.
+	* assuan-logging.c (_assuan_log_print_buffer): Likewise for N.
+	* funopen.c (_assuan_funopen): Remove initializer to silence gcc
+	-W warning.
+	* assuan-handler.c (std_cmd_table): Add missing initializer to
+	silence gcc -W warning.
+	* assuan-socket-server.c (io): Likewise.
+	* assuan-socket-connect.c (assuan_socket_connect_ext): Likewise.
+
 2008-10-29  Marcus Brinkmann  <[email protected]>
 
 	* assuan.h (assuan_error_t) (_ASSUAN_ONLY_GPG_ERRORS): Make
diff --git a/src/assuan-handler.c b/src/assuan-handler.c
index 2a80596..b940bfd 100644
--- a/src/assuan-handler.c
+++ b/src/assuan-handler.c
@@ -141,7 +141,7 @@ std_handler_reset (assuan_context_t ctx, char *line)
 static int
 std_handler_help (assuan_context_t ctx, char *line)
 {
-  int i;
+  unsigned int i;
   char buf[ASSUAN_LINELENGTH];
 
   for (i = 0; i < ctx->cmdtbl_used; i++)
@@ -251,10 +251,10 @@ static struct {
   { "END",    std_handler_end, 1 },
   { "HELP",   std_handler_help, 1 },
               
-  { "INPUT",  std_handler_input },
-  { "OUTPUT", std_handler_output },
+  { "INPUT",  std_handler_input, 0 },
+  { "OUTPUT", std_handler_output, 0 },
   { "OPTION", std_handler_option, 1 },
-  { NULL }
+  { NULL, NULL, 0 }
 };
 
 
diff --git a/src/assuan-logging.c b/src/assuan-logging.c
index bd28eb1..2ebd667 100644
--- a/src/assuan-logging.c
+++ b/src/assuan-logging.c
@@ -129,14 +129,14 @@ void
 _assuan_log_print_buffer (FILE *fp, const void *buffer, size_t length)
 {
   const unsigned char *s;
-  int n;
+  unsigned int n;
 
-  for (n=length,s=buffer; n; n--, s++)
-    if  ((!isascii (*s) || iscntrl (*s) || !isprint (*s)) && !(*s >= 0x80))
+  for (n = length, s = buffer; n; n--, s++)
+    if  ((! isascii (*s) || iscntrl (*s) || ! isprint (*s)) && !(*s >= 0x80))
       break;
 
   s = buffer;
-  if (!n && *s != '[')
+  if (! n && *s != '[')
     fwrite (buffer, length, 1, fp);
   else
     {
@@ -144,15 +144,15 @@ _assuan_log_print_buffer (FILE *fp, const void *buffer, size_t length)
       flockfile (fp);
 #endif
       putc_unlocked ('[', fp);
-      if ( length > 16 && !full_logging)
+      if (length > 16 && ! full_logging)
         {
-          for (n=0; n < 12; n++, s++)
+          for (n = 0; n < 12; n++, s++)
             fprintf (fp, " %02x", *s);
-          fprintf (fp, " ...(%d bytes skipped)", (int)length - 12);
+          fprintf (fp, " ...(%d bytes skipped)", (int) length - 12);
         }
       else
         {
-          for (n=0; n < length; n++, s++)
+          for (n = 0; n < length; n++, s++)
             fprintf (fp, " %02x", *s);
         }
       putc_unlocked (' ', fp);
diff --git a/src/assuan-socket-connect.c b/src/assuan-socket-connect.c
index 69d87f6..8eb6d82 100644
--- a/src/assuan-socket-connect.c
+++ b/src/assuan-socket-connect.c
@@ -91,9 +91,8 @@ assuan_socket_connect_ext (assuan_context_t *r_ctx,
                            const char *name, pid_t server_pid,
                            unsigned int flags)
 {
-  static struct assuan_io io = { _assuan_simple_read,
-				 _assuan_simple_write };
-
+  static struct assuan_io io = { _assuan_simple_read, _assuan_simple_write,
+				 NULL, NULL };
   assuan_error_t err;
   assuan_context_t ctx;
   assuan_fd_t fd;
diff --git a/src/assuan-socket-server.c b/src/assuan-socket-server.c
index b754b81..c536dba 100644
--- a/src/assuan-socket-server.c
+++ b/src/assuan-socket-server.c
@@ -38,9 +38,8 @@
 
 #include "assuan-defs.h"
 
-static struct assuan_io io = { _assuan_simple_read,
-			       _assuan_simple_write };
-
+static struct assuan_io io = { _assuan_simple_read, _assuan_simple_write,
+			       NULL, NULL };
 
 static int
 accept_connection_bottom (assuan_context_t ctx)
diff --git a/src/funopen.c b/src/funopen.c
index 363aa59..fb87f96 100644
--- a/src/funopen.c
+++ b/src/funopen.c
@@ -46,7 +46,7 @@ _assuan_funopen(void *cookie,
                 cookie_seek_function_t *seekfn,
                 cookie_close_function_t *closefn)
 {
-  cookie_io_functions_t io = { NULL };
+  cookie_io_functions_t io;
 
   io.read = readfn;
   io.write = writefn;
diff --git a/tests/fdpassing.c b/tests/fdpassing.c
index bab6fdc..df4dfb7 100644
--- a/tests/fdpassing.c
+++ b/tests/fdpassing.c
@@ -72,15 +72,17 @@ cmd_echo (assuan_context_t ctx, char *line)
 static assuan_error_t
 register_commands (assuan_context_t ctx)
 {
-  static struct {
+  static struct
+  {
     const char *name;
-    int (*handler)(assuan_context_t, char *line);
-  } table[] = {
-    { "ECHO",       cmd_echo },
-    { "INPUT",      NULL },
-    { "OUTPUT",     NULL },
-    { NULL }
-  };
+    int (*handler) (assuan_context_t, char *line);
+  } table[] =
+      {
+	{ "ECHO", cmd_echo },
+	{ "INPUT", NULL },
+	{ "OUTPUT", NULL },
+	{ NULL, NULL }
+      };
   int i;
   assuan_error_t rc;