[svn] assuan - r292 - in trunk: . src tests
svn author marcus
cvs at cvs.gnupg.org
Mon Nov 3 19:27:11 CET 2008
Author: marcus
Date: 2008-11-03 19:27:11 +0100 (Mon, 03 Nov 2008)
New Revision: 292
Modified:
trunk/ChangeLog
trunk/src/ChangeLog
trunk/src/assuan-handler.c
trunk/src/assuan-logging.c
trunk/src/assuan-socket-connect.c
trunk/src/assuan-socket-server.c
trunk/src/funopen.c
trunk/tests/fdpassing.c
Log:
2008-11-03 Marcus Brinkmann <marcus at g10code.de>
* tests/fdpassing.c (register_commands): Add missing initializer
to silence gcc -W warning.
src/
2008-11-03 Marcus Brinkmann <marcus at g10code.de>
* 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.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-10-29 19:52:36 UTC (rev 291)
+++ trunk/ChangeLog 2008-11-03 18:27:11 UTC (rev 292)
@@ -1,3 +1,8 @@
+2008-11-03 Marcus Brinkmann <marcus at g10code.de>
+
+ * tests/fdpassing.c (register_commands): Add missing initializer
+ to silence gcc -W warning.
+
2008-05-25 Werner Koch <wk at g10code.com>
Released 1.0.5.
Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog 2008-10-29 19:52:36 UTC (rev 291)
+++ trunk/src/ChangeLog 2008-11-03 18:27:11 UTC (rev 292)
@@ -1,3 +1,15 @@
+2008-11-03 Marcus Brinkmann <marcus at g10code.de>
+
+ * 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 <marcus at g10code.de>
* assuan.h (assuan_error_t) (_ASSUAN_ONLY_GPG_ERRORS): Make
Modified: trunk/src/assuan-handler.c
===================================================================
--- trunk/src/assuan-handler.c 2008-10-29 19:52:36 UTC (rev 291)
+++ trunk/src/assuan-handler.c 2008-11-03 18:27:11 UTC (rev 292)
@@ -141,7 +141,7 @@
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 @@
{ "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 }
};
Modified: trunk/src/assuan-logging.c
===================================================================
--- trunk/src/assuan-logging.c 2008-10-29 19:52:36 UTC (rev 291)
+++ trunk/src/assuan-logging.c 2008-11-03 18:27:11 UTC (rev 292)
@@ -129,14 +129,14 @@
_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 @@
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);
Modified: trunk/src/assuan-socket-connect.c
===================================================================
--- trunk/src/assuan-socket-connect.c 2008-10-29 19:52:36 UTC (rev 291)
+++ trunk/src/assuan-socket-connect.c 2008-11-03 18:27:11 UTC (rev 292)
@@ -91,9 +91,8 @@
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;
Modified: trunk/src/assuan-socket-server.c
===================================================================
--- trunk/src/assuan-socket-server.c 2008-10-29 19:52:36 UTC (rev 291)
+++ trunk/src/assuan-socket-server.c 2008-11-03 18:27:11 UTC (rev 292)
@@ -38,10 +38,9 @@
#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)
{
Modified: trunk/src/funopen.c
===================================================================
--- trunk/src/funopen.c 2008-10-29 19:52:36 UTC (rev 291)
+++ trunk/src/funopen.c 2008-11-03 18:27:11 UTC (rev 292)
@@ -46,7 +46,7 @@
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;
Modified: trunk/tests/fdpassing.c
===================================================================
--- trunk/tests/fdpassing.c 2008-10-29 19:52:36 UTC (rev 291)
+++ trunk/tests/fdpassing.c 2008-11-03 18:27:11 UTC (rev 292)
@@ -72,15 +72,17 @@
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;
More information about the Gnupg-commits
mailing list