diff options
author | Rob Austein <sra@hactrn.net> | 2009-04-25 06:00:12 +0000 |
---|---|---|
committer | Rob Austein <sra@hactrn.net> | 2009-04-25 06:00:12 +0000 |
commit | 3f8208f49401d3f8178bdb13fdc3a1febb290696 (patch) | |
tree | f7f4f306dce3db4bb1796c0828723ebab9d4ab2a /rcynic/rcynic.c | |
parent | 1efec3e593f8b925cc807ffd2132c38d415e5054 (diff) |
Clean up a few warnings that show up on recent Ubuntu systems with gcc
4.2 and later.
svn path=/rcynic/rcynic.c; revision=2357
Diffstat (limited to 'rcynic/rcynic.c')
-rw-r--r-- | rcynic/rcynic.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/rcynic/rcynic.c b/rcynic/rcynic.c index e537a497..e7a81d80 100644 --- a/rcynic/rcynic.c +++ b/rcynic/rcynic.c @@ -973,12 +973,12 @@ static FileAndHash *next_uri(const rcynic_ctx_t *rc, while ((fah = sk_FileAndHash_value(manifest->fileList, *iterator)) != NULL) { ++*iterator; - if (strlen(base_uri) + strlen(fah->file->data) >= urilen) { + if (strlen(base_uri) + strlen((char *) fah->file->data) >= urilen) { logmsg(rc, log_data_err, "URI %s%s too long, skipping", base_uri, fah->file->data); continue; } strcpy(uri, base_uri); - strcat(uri, fah->file->data); + strcat(uri, (char *) fah->file->data); return fah; } @@ -1435,7 +1435,7 @@ static void *read_file_with_hash(const char *filename, if (hash != NULL) { memset(hash, 0, hashlen); - BIO_gets(b, hash, hashlen); + BIO_gets(b, (char *) hash, hashlen); } error: @@ -1983,7 +1983,7 @@ static X509 *check_cert(rcynic_ctx_t *rc, mib_increment(rc, uri, (backup ? backup_cert_accepted : current_cert_accepted)); if (!backup) - sk_STRING_delete(rc->backup_cache, sk_STRING_find(rc->backup_cache, uri)); + (void) sk_STRING_delete(rc->backup_cache, sk_STRING_find(rc->backup_cache, uri)); else if (!sk_STRING_push_strdup(rc->backup_cache, uri)) logmsg(rc, log_sys_err, "Couldn't cache URI %s, blundering onward", uri); @@ -2097,7 +2097,7 @@ static Manifest *check_manifest_1(const rcynic_ctx_t *rc, goto done; for (i = 0; (fah = sk_FileAndHash_value(manifest->fileList, i)) != NULL; i++) - if (!strcmp(fah->file->data, crl_tail)) + if (!strcmp((char *) fah->file->data, crl_tail)) break; if (fah) { |