diff options
author | guenther <> | 2014-04-20 20:06:20 +0000 |
---|---|---|
committer | guenther <> | 2014-04-20 20:06:20 +0000 |
commit | 6905ab05e647bd3379cca26c824e9ecd44942240 (patch) | |
tree | 90931c8435500dea3d590240ea7d0d9d4c989942 /src/lib | |
parent | 538022838c853c2ae436fbf51f9f3255ab1bc93e (diff) | |
download | openbsd-6905ab05e647bd3379cca26c824e9ecd44942240.tar.gz openbsd-6905ab05e647bd3379cca26c824e9ecd44942240.tar.bz2 openbsd-6905ab05e647bd3379cca26c824e9ecd44942240.zip |
Restore beck's (void)snprintf(): they were reviewed.
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/libcrypto/x509/by_dir.c | 2 | ||||
-rw-r--r-- | src/lib/libcrypto/x509/x509_txt.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/x509v3/v3_alt.c | 4 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/x509/by_dir.c | 2 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/x509/x509_txt.c | 4 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/x509v3/v3_alt.c | 4 |
6 files changed, 10 insertions, 10 deletions
diff --git a/src/lib/libcrypto/x509/by_dir.c b/src/lib/libcrypto/x509/by_dir.c index 295389bcb3..fdfca6140a 100644 --- a/src/lib/libcrypto/x509/by_dir.c +++ b/src/lib/libcrypto/x509/by_dir.c | |||
@@ -336,7 +336,7 @@ get_cert_by_subject(X509_LOOKUP *xl, int type, X509_NAME *name, | |||
336 | hent = NULL; | 336 | hent = NULL; |
337 | } | 337 | } |
338 | for (;;) { | 338 | for (;;) { |
339 | snprintf(b->data, b->max, "%s/%08lx.%s%d", | 339 | (void) snprintf(b->data, b->max, "%s/%08lx.%s%d", |
340 | ent->dir, h, postfix, k); | 340 | ent->dir, h, postfix, k); |
341 | 341 | ||
342 | #ifndef OPENSSL_NO_POSIX_IO | 342 | #ifndef OPENSSL_NO_POSIX_IO |
diff --git a/src/lib/libcrypto/x509/x509_txt.c b/src/lib/libcrypto/x509/x509_txt.c index 31a909a12c..3fb3b12355 100644 --- a/src/lib/libcrypto/x509/x509_txt.c +++ b/src/lib/libcrypto/x509/x509_txt.c | |||
@@ -184,7 +184,7 @@ X509_verify_cert_error_string(long n) | |||
184 | return("CRL path validation error"); | 184 | return("CRL path validation error"); |
185 | 185 | ||
186 | default: | 186 | default: |
187 | snprintf(buf, sizeof buf, "error number %ld", n); | 187 | (void) snprintf(buf, sizeof buf, "error number %ld", n); |
188 | return (buf); | 188 | return(buf); |
189 | } | 189 | } |
190 | } | 190 | } |
diff --git a/src/lib/libcrypto/x509v3/v3_alt.c b/src/lib/libcrypto/x509v3/v3_alt.c index 95b1fa4c97..636677df94 100644 --- a/src/lib/libcrypto/x509v3/v3_alt.c +++ b/src/lib/libcrypto/x509v3/v3_alt.c | |||
@@ -143,14 +143,14 @@ STACK_OF(CONF_VALUE) *i2v_GENERAL_NAME(X509V3_EXT_METHOD *method, | |||
143 | case GEN_IPADD: | 143 | case GEN_IPADD: |
144 | p = gen->d.ip->data; | 144 | p = gen->d.ip->data; |
145 | if(gen->d.ip->length == 4) | 145 | if(gen->d.ip->length == 4) |
146 | snprintf(oline, sizeof oline, | 146 | (void) snprintf(oline, sizeof oline, |
147 | "%d.%d.%d.%d", p[0], p[1], p[2], p[3]); | 147 | "%d.%d.%d.%d", p[0], p[1], p[2], p[3]); |
148 | else if(gen->d.ip->length == 16) | 148 | else if(gen->d.ip->length == 16) |
149 | { | 149 | { |
150 | oline[0] = 0; | 150 | oline[0] = 0; |
151 | for (i = 0; i < 8; i++) | 151 | for (i = 0; i < 8; i++) |
152 | { | 152 | { |
153 | snprintf(htmp, sizeof htmp, | 153 | (void) snprintf(htmp, sizeof htmp, |
154 | "%X", p[0] << 8 | p[1]); | 154 | "%X", p[0] << 8 | p[1]); |
155 | p += 2; | 155 | p += 2; |
156 | strlcat(oline, htmp, sizeof(oline)); | 156 | strlcat(oline, htmp, sizeof(oline)); |
diff --git a/src/lib/libssl/src/crypto/x509/by_dir.c b/src/lib/libssl/src/crypto/x509/by_dir.c index 295389bcb3..fdfca6140a 100644 --- a/src/lib/libssl/src/crypto/x509/by_dir.c +++ b/src/lib/libssl/src/crypto/x509/by_dir.c | |||
@@ -336,7 +336,7 @@ get_cert_by_subject(X509_LOOKUP *xl, int type, X509_NAME *name, | |||
336 | hent = NULL; | 336 | hent = NULL; |
337 | } | 337 | } |
338 | for (;;) { | 338 | for (;;) { |
339 | snprintf(b->data, b->max, "%s/%08lx.%s%d", | 339 | (void) snprintf(b->data, b->max, "%s/%08lx.%s%d", |
340 | ent->dir, h, postfix, k); | 340 | ent->dir, h, postfix, k); |
341 | 341 | ||
342 | #ifndef OPENSSL_NO_POSIX_IO | 342 | #ifndef OPENSSL_NO_POSIX_IO |
diff --git a/src/lib/libssl/src/crypto/x509/x509_txt.c b/src/lib/libssl/src/crypto/x509/x509_txt.c index 31a909a12c..3fb3b12355 100644 --- a/src/lib/libssl/src/crypto/x509/x509_txt.c +++ b/src/lib/libssl/src/crypto/x509/x509_txt.c | |||
@@ -184,7 +184,7 @@ X509_verify_cert_error_string(long n) | |||
184 | return("CRL path validation error"); | 184 | return("CRL path validation error"); |
185 | 185 | ||
186 | default: | 186 | default: |
187 | snprintf(buf, sizeof buf, "error number %ld", n); | 187 | (void) snprintf(buf, sizeof buf, "error number %ld", n); |
188 | return (buf); | 188 | return(buf); |
189 | } | 189 | } |
190 | } | 190 | } |
diff --git a/src/lib/libssl/src/crypto/x509v3/v3_alt.c b/src/lib/libssl/src/crypto/x509v3/v3_alt.c index 95b1fa4c97..636677df94 100644 --- a/src/lib/libssl/src/crypto/x509v3/v3_alt.c +++ b/src/lib/libssl/src/crypto/x509v3/v3_alt.c | |||
@@ -143,14 +143,14 @@ STACK_OF(CONF_VALUE) *i2v_GENERAL_NAME(X509V3_EXT_METHOD *method, | |||
143 | case GEN_IPADD: | 143 | case GEN_IPADD: |
144 | p = gen->d.ip->data; | 144 | p = gen->d.ip->data; |
145 | if(gen->d.ip->length == 4) | 145 | if(gen->d.ip->length == 4) |
146 | snprintf(oline, sizeof oline, | 146 | (void) snprintf(oline, sizeof oline, |
147 | "%d.%d.%d.%d", p[0], p[1], p[2], p[3]); | 147 | "%d.%d.%d.%d", p[0], p[1], p[2], p[3]); |
148 | else if(gen->d.ip->length == 16) | 148 | else if(gen->d.ip->length == 16) |
149 | { | 149 | { |
150 | oline[0] = 0; | 150 | oline[0] = 0; |
151 | for (i = 0; i < 8; i++) | 151 | for (i = 0; i < 8; i++) |
152 | { | 152 | { |
153 | snprintf(htmp, sizeof htmp, | 153 | (void) snprintf(htmp, sizeof htmp, |
154 | "%X", p[0] << 8 | p[1]); | 154 | "%X", p[0] << 8 | p[1]); |
155 | p += 2; | 155 | p += 2; |
156 | strlcat(oline, htmp, sizeof(oline)); | 156 | strlcat(oline, htmp, sizeof(oline)); |