diff options
author | beck <> | 2014-04-15 16:21:04 +0000 |
---|---|---|
committer | beck <> | 2014-04-15 16:21:04 +0000 |
commit | 8de0117e810bf2887ba81b54345d86f49dd504a8 (patch) | |
tree | 8c2058c07d3cdac3caf00950e53159c1c251f257 /src/lib/libcrypto/bio/bio_cb.c | |
parent | fd934c882a62cc862a41725de129e7a623ce16a3 (diff) | |
download | openbsd-8de0117e810bf2887ba81b54345d86f49dd504a8.tar.gz openbsd-8de0117e810bf2887ba81b54345d86f49dd504a8.tar.bz2 openbsd-8de0117e810bf2887ba81b54345d86f49dd504a8.zip |
Part 1 of eliminating BIO_snprintf(). This fixes mechanical conversions
where the return value is ignored changing to (void) snprintf.
ok deraadt@
Diffstat (limited to 'src/lib/libcrypto/bio/bio_cb.c')
-rw-r--r-- | src/lib/libcrypto/bio/bio_cb.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/lib/libcrypto/bio/bio_cb.c b/src/lib/libcrypto/bio/bio_cb.c index 7334a254bf..78c8974ab4 100644 --- a/src/lib/libcrypto/bio/bio_cb.c +++ b/src/lib/libcrypto/bio/bio_cb.c | |||
@@ -75,60 +75,60 @@ long BIO_debug_callback(BIO *bio, int cmd, const char *argp, | |||
75 | if (BIO_CB_RETURN & cmd) | 75 | if (BIO_CB_RETURN & cmd) |
76 | r=ret; | 76 | r=ret; |
77 | 77 | ||
78 | BIO_snprintf(buf,sizeof buf,"BIO[%08lX]:",(unsigned long)bio); | 78 | (void) snprintf(buf,sizeof buf,"BIO[%08lX]:",(unsigned long)bio); |
79 | p= &(buf[14]); | 79 | p= &(buf[14]); |
80 | p_maxlen = sizeof buf - 14; | 80 | p_maxlen = sizeof buf - 14; |
81 | switch (cmd) | 81 | switch (cmd) |
82 | { | 82 | { |
83 | case BIO_CB_FREE: | 83 | case BIO_CB_FREE: |
84 | BIO_snprintf(p,p_maxlen,"Free - %s\n",bio->method->name); | 84 | (void) snprintf(p,p_maxlen,"Free - %s\n",bio->method->name); |
85 | break; | 85 | break; |
86 | case BIO_CB_READ: | 86 | case BIO_CB_READ: |
87 | if (bio->method->type & BIO_TYPE_DESCRIPTOR) | 87 | if (bio->method->type & BIO_TYPE_DESCRIPTOR) |
88 | BIO_snprintf(p,p_maxlen,"read(%d,%lu) - %s fd=%d\n", | 88 | (void) snprintf(p,p_maxlen,"read(%d,%lu) - %s fd=%d\n", |
89 | bio->num,(unsigned long)argi, | 89 | bio->num,(unsigned long)argi, |
90 | bio->method->name,bio->num); | 90 | bio->method->name,bio->num); |
91 | else | 91 | else |
92 | BIO_snprintf(p,p_maxlen,"read(%d,%lu) - %s\n", | 92 | (void) snprintf(p,p_maxlen,"read(%d,%lu) - %s\n", |
93 | bio->num,(unsigned long)argi, | 93 | bio->num,(unsigned long)argi, |
94 | bio->method->name); | 94 | bio->method->name); |
95 | break; | 95 | break; |
96 | case BIO_CB_WRITE: | 96 | case BIO_CB_WRITE: |
97 | if (bio->method->type & BIO_TYPE_DESCRIPTOR) | 97 | if (bio->method->type & BIO_TYPE_DESCRIPTOR) |
98 | BIO_snprintf(p,p_maxlen,"write(%d,%lu) - %s fd=%d\n", | 98 | (void) snprintf(p,p_maxlen,"write(%d,%lu) - %s fd=%d\n", |
99 | bio->num,(unsigned long)argi, | 99 | bio->num,(unsigned long)argi, |
100 | bio->method->name,bio->num); | 100 | bio->method->name,bio->num); |
101 | else | 101 | else |
102 | BIO_snprintf(p,p_maxlen,"write(%d,%lu) - %s\n", | 102 | (void) snprintf(p,p_maxlen,"write(%d,%lu) - %s\n", |
103 | bio->num,(unsigned long)argi, | 103 | bio->num,(unsigned long)argi, |
104 | bio->method->name); | 104 | bio->method->name); |
105 | break; | 105 | break; |
106 | case BIO_CB_PUTS: | 106 | case BIO_CB_PUTS: |
107 | BIO_snprintf(p,p_maxlen,"puts() - %s\n",bio->method->name); | 107 | (void) snprintf(p,p_maxlen,"puts() - %s\n",bio->method->name); |
108 | break; | 108 | break; |
109 | case BIO_CB_GETS: | 109 | case BIO_CB_GETS: |
110 | BIO_snprintf(p,p_maxlen,"gets(%lu) - %s\n",(unsigned long)argi,bio->method->name); | 110 | (void) snprintf(p,p_maxlen,"gets(%lu) - %s\n",(unsigned long)argi,bio->method->name); |
111 | break; | 111 | break; |
112 | case BIO_CB_CTRL: | 112 | case BIO_CB_CTRL: |
113 | BIO_snprintf(p,p_maxlen,"ctrl(%lu) - %s\n",(unsigned long)argi,bio->method->name); | 113 | (void) snprintf(p,p_maxlen,"ctrl(%lu) - %s\n",(unsigned long)argi,bio->method->name); |
114 | break; | 114 | break; |
115 | case BIO_CB_RETURN|BIO_CB_READ: | 115 | case BIO_CB_RETURN|BIO_CB_READ: |
116 | BIO_snprintf(p,p_maxlen,"read return %ld\n",ret); | 116 | (void) snprintf(p,p_maxlen,"read return %ld\n",ret); |
117 | break; | 117 | break; |
118 | case BIO_CB_RETURN|BIO_CB_WRITE: | 118 | case BIO_CB_RETURN|BIO_CB_WRITE: |
119 | BIO_snprintf(p,p_maxlen,"write return %ld\n",ret); | 119 | (void) snprintf(p,p_maxlen,"write return %ld\n",ret); |
120 | break; | 120 | break; |
121 | case BIO_CB_RETURN|BIO_CB_GETS: | 121 | case BIO_CB_RETURN|BIO_CB_GETS: |
122 | BIO_snprintf(p,p_maxlen,"gets return %ld\n",ret); | 122 | (void) snprintf(p,p_maxlen,"gets return %ld\n",ret); |
123 | break; | 123 | break; |
124 | case BIO_CB_RETURN|BIO_CB_PUTS: | 124 | case BIO_CB_RETURN|BIO_CB_PUTS: |
125 | BIO_snprintf(p,p_maxlen,"puts return %ld\n",ret); | 125 | (void) snprintf(p,p_maxlen,"puts return %ld\n",ret); |
126 | break; | 126 | break; |
127 | case BIO_CB_RETURN|BIO_CB_CTRL: | 127 | case BIO_CB_RETURN|BIO_CB_CTRL: |
128 | BIO_snprintf(p,p_maxlen,"ctrl return %ld\n",ret); | 128 | (void) snprintf(p,p_maxlen,"ctrl return %ld\n",ret); |
129 | break; | 129 | break; |
130 | default: | 130 | default: |
131 | BIO_snprintf(p,p_maxlen,"bio callback - unknown type (%d)\n",cmd); | 131 | (void) snprintf(p,p_maxlen,"bio callback - unknown type (%d)\n",cmd); |
132 | break; | 132 | break; |
133 | } | 133 | } |
134 | 134 | ||