[svn] dirmngr - r311 - in trunk: . jnlib src tests
svn author marcus
cvs at cvs.gnupg.org
Thu Oct 30 11:21:19 CET 2008
Author: marcus
Date: 2008-10-30 11:21:19 +0100 (Thu, 30 Oct 2008)
New Revision: 311
Modified:
trunk/ChangeLog
trunk/jnlib/ChangeLog
trunk/jnlib/logging.c
trunk/src/ChangeLog
trunk/src/crlcache.c
trunk/src/dirmngr-client.c
trunk/src/dirmngr.c
trunk/src/dirmngr_ldap.c
trunk/src/estream.c
trunk/src/server.c
trunk/tests/asschk.c
Log:
2008-10-29 Marcus Brinkmann <marcus at g10code.de>
* tests/asschk.c (interpreter): Add missing initializer to silence
gcc -W warning.
(expand_line): Add explicit cast for same reason.
jnlib/
2008-10-30 Marcus Brinkmann <marcus at g10code.de>
* logging.c (set_file_fd): Add missing initializer to silence gcc
-W warning.
src/
2008-10-29 Marcus Brinkmann <marcus at g10code.de>
* estream.c (es_getline): Add explicit cast to silence gcc -W
warning.
* crlcache.c (finish_sig_check): Likewise.
* dirmngr.c (opts): Add missing initializer to silence gcc
-W warning.
* server.c (register_commands): Likewise.
* dirmngr-client.c (opts): Likewise.
* dirmngr_ldap.c (opts): Likewise.
* dirmngr-client.c (status_cb, inq_cert, data_cb): Change return
type to gpg_error_t to silence gcc warning.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-10-21 14:50:28 UTC (rev 310)
+++ trunk/ChangeLog 2008-10-30 10:21:19 UTC (rev 311)
@@ -1,3 +1,9 @@
+2008-10-29 Marcus Brinkmann <marcus at g10code.de>
+
+ * tests/asschk.c (interpreter): Add missing initializer to silence
+ gcc -W warning.
+ (expand_line): Add explicit cast for same reason.
+
2008-10-21 Werner Koch <wk at g10code.com>
* configure.ac: Require libgcrypt 1.4. Remove test for
Modified: trunk/jnlib/ChangeLog
===================================================================
--- trunk/jnlib/ChangeLog 2008-10-21 14:50:28 UTC (rev 310)
+++ trunk/jnlib/ChangeLog 2008-10-30 10:21:19 UTC (rev 311)
@@ -1,3 +1,8 @@
+2008-10-30 Marcus Brinkmann <marcus at g10code.de>
+
+ * logging.c (set_file_fd): Add missing initializer to silence gcc
+ -W warning.
+
2008-02-22 Werner Koch <wk at g10code.com>
* argparse.c (strusage): Set copyright year to 2008.
Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog 2008-10-21 14:50:28 UTC (rev 310)
+++ trunk/src/ChangeLog 2008-10-30 10:21:19 UTC (rev 311)
@@ -1,3 +1,19 @@
+2008-10-29 Marcus Brinkmann <marcus at g10code.de>
+
+
+ * estream.c (es_getline): Add explicit cast to silence gcc -W
+ warning.
+ * crlcache.c (finish_sig_check): Likewise.
+
+ * dirmngr.c (opts): Add missing initializer to silence gcc
+ -W warning.
+ * server.c (register_commands): Likewise.
+ * dirmngr-client.c (opts): Likewise.
+ * dirmngr_ldap.c (opts): Likewise.
+
+ * dirmngr-client.c (status_cb, inq_cert, data_cb): Change return
+ type to gpg_error_t to silence gcc warning.
+
2008-10-21 Werner Koch <wk at g10code.com>
* certcache.c (load_certs_from_dir): Accept ".der" files.
Modified: trunk/jnlib/logging.c
===================================================================
--- trunk/jnlib/logging.c 2008-10-21 14:50:28 UTC (rev 310)
+++ trunk/jnlib/logging.c 2008-10-30 10:21:19 UTC (rev 311)
@@ -276,7 +276,7 @@
#ifdef HAVE_FOPENCOOKIE
{
- cookie_io_functions_t io = { NULL };
+ cookie_io_functions_t io = { NULL, NULL, NULL, NULL };
io.write = fun_writer;
io.close = fun_closer;
Modified: trunk/src/crlcache.c
===================================================================
--- trunk/src/crlcache.c 2008-10-21 14:50:28 UTC (rev 310)
+++ trunk/src/crlcache.c 2008-10-30 10:21:19 UTC (rev 311)
@@ -1565,7 +1565,7 @@
char algoname[50];
size_t n;
gcry_sexp_t s_sig = NULL, s_hash = NULL, s_pkey = NULL;
- int i;
+ unsigned int i;
/* This also stops debugging on the MD. */
gcry_md_final (md);
@@ -1608,7 +1608,7 @@
/* Create an S-expression with the actual hash value. */
s = gcry_md_algo_name (algo);
- for (i=0; *s && i < sizeof(algoname) - 1; s++, i++)
+ for (i = 0; *s && i < sizeof(algoname) - 1; s++, i++)
algoname[i] = ascii_tolower (*s);
algoname[i] = 0;
err = gcry_sexp_build (&s_hash, NULL, "(data(flags pkcs1)(hash %s %b))",
@@ -2218,7 +2218,7 @@
{
struct cdb_find cdbfp;
struct cdb *cdb;
- int i, rc;
+ int rc;
int warn = 0;
const unsigned char *s;
@@ -2269,6 +2269,7 @@
int reason;
int any = 0;
cdbi_t n;
+ cdbi_t i;
rc = 0;
n = cdb_datalen (cdb);
@@ -2299,7 +2300,7 @@
reason = *record;
fputs (" ", fp);
- for (i=0; i < n; i++)
+ for (i = 0; i < n; i++)
fprintf (fp, "%02X", keyrecord[i]);
fputs (":\t reasons( ", fp);
Modified: trunk/src/dirmngr-client.c
===================================================================
--- trunk/src/dirmngr-client.c 2008-10-21 14:50:28 UTC (rev 310)
+++ trunk/src/dirmngr-client.c 2008-10-30 10:21:19 UTC (rev 311)
@@ -80,7 +80,7 @@
{ oPEM, "pem", 0, N_("certificates are expected in PEM format")},
{ oForceDefaultResponder, "force-default-responder", 0,
N_("force the use of the default OCSP responder")},
- { 0 }
+ { 0, NULL, 0, NULL }
};
@@ -419,7 +419,7 @@
/* Print status line from the assuan protocol. */
-static int
+static gpg_error_t
status_cb (void *opaque, const char *line)
{
(void)opaque;
@@ -430,7 +430,7 @@
}
/* Print data as retrieved by the lookup function. */
-static int
+static gpg_error_t
data_cb (void *opaque, const void *buffer, size_t length)
{
gpg_error_t err;
@@ -766,7 +766,7 @@
/* Callback for the inquire fiunction to send back the certificate. */
-static int
+static gpg_error_t
inq_cert (void *opaque, const char *line)
{
struct inq_cert_parm_s *parm = opaque;
Modified: trunk/src/dirmngr.c
===================================================================
--- trunk/src/dirmngr.c 2008-10-21 14:50:28 UTC (rev 310)
+++ trunk/src/dirmngr.c 2008-10-30 10:21:19 UTC (rev 311)
@@ -200,7 +200,7 @@
"@\n(See the \"info\" manual for a complete listing of all commands and options)\n"
)},
- {0}
+ { 0, NULL, 0, NULL }
};
#define DEFAULT_MAX_REPLIES 10
Modified: trunk/src/dirmngr_ldap.c
===================================================================
--- trunk/src/dirmngr_ldap.c 2008-10-21 14:50:28 UTC (rev 310)
+++ trunk/src/dirmngr_ldap.c 2008-10-30 10:21:19 UTC (rev 311)
@@ -100,7 +100,7 @@
{ oAttr, "attr", 2, N_("|STRING|return the attribute STRING")},
{ oOnlySearchTimeout, "only-search-timeout", 0, "@"},
{ oLogWithPID,"log-with-pid", 0, "@"},
- {0}
+ { 0, NULL, 0, NULL }
};
Modified: trunk/src/estream.c
===================================================================
--- trunk/src/estream.c 2008-10-21 14:50:28 UTC (rev 310)
+++ trunk/src/estream.c 2008-10-30 10:21:19 UTC (rev 311)
@@ -2720,7 +2720,7 @@
out:
- return err ? err : line_n;
+ return err ? err : (ssize_t) line_n;
}
Modified: trunk/src/server.c
===================================================================
--- trunk/src/server.c 2008-10-21 14:50:28 UTC (rev 310)
+++ trunk/src/server.c 2008-10-30 10:21:19 UTC (rev 311)
@@ -1242,7 +1242,7 @@
{ "VALIDATE", cmd_validate },
{ "INPUT", NULL },
{ "OUTPUT", NULL },
- { NULL }
+ { NULL, NULL }
};
int i, j, rc;
Modified: trunk/tests/asschk.c
===================================================================
--- trunk/tests/asschk.c 2008-10-21 14:50:28 UTC (rev 310)
+++ trunk/tests/asschk.c 2008-10-30 10:21:19 UTC (rev 311)
@@ -601,7 +601,7 @@
if (!value)
value = "";
valuelen = strlen (value);
- if (valuelen <= pend - p)
+ if (valuelen <= (size_t) (pend - p))
{
memcpy (p, value, valuelen);
p += valuelen;
@@ -912,7 +912,7 @@
{ "fail-if" , cmd_fail_if },
{ "cmpfiles" , cmd_cmpfiles },
{ "getenv" , cmd_getenv },
- { NULL }
+ { NULL, NULL }
};
char *p, *save_p;
int i, save_c;
More information about the Gnupg-commits
mailing list