diff options
| author | Will Thompson <will.thompson@collabora.co.uk> | 2011-06-02 11:43:16 +0100 |
|---|---|---|
| committer | Marco Barisione <marco@barisione.org> | 2011-09-02 11:48:33 +0100 |
| commit | d9b8d27706b6764439c8d4bf1142bc9aa3bac3f1 (patch) | |
| tree | eaf0b44d99f6a15f512f053c4a89dc1e771faabb | |
| parent | 240bbea91a9b1a49f4465f253e75d4ae83fdbe21 (diff) | |
| download | wocky-gabble-0.12.tar.gz | |
OpenSSL: squash GCC 4.6 -Wunused-but-set-variable warningsgabble-0.12
Ironically these variables were added to squash warnings from static
analysis …
Reviewed-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
Fixes: <https://bugs.freedesktop.org/show_bug.cgi?id=37848>
| -rw-r--r-- | wocky/wocky-openssl.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/wocky/wocky-openssl.c b/wocky/wocky-openssl.c index 83a7bef..aa4d2bc 100644 --- a/wocky/wocky-openssl.c +++ b/wocky/wocky-openssl.c @@ -685,7 +685,6 @@ wocky_tls_session_handshake (WockyTLSSession *session, if (want_write) { - int ignored; gchar *wbuf; GOutputStream *out = g_io_stream_get_output_stream (session->stream); long wsize = BIO_get_mem_data (session->wbio, &wbuf); @@ -694,7 +693,7 @@ wocky_tls_session_handshake (WockyTLSSession *session, if (wsize > 0) sent = g_output_stream_write (out, wbuf, wsize, NULL, error); DEBUG ("sent %" G_GSSIZE_FORMAT " cipherbytes", sent); - ignored = BIO_reset (session->wbio); + (void) BIO_reset (session->wbio); } if (want_read) @@ -1516,8 +1515,6 @@ wocky_tls_session_write_ready (GObject *object, WockyTLSSession *session = WOCKY_TLS_SESSION (user_data); gint buffered = BIO_pending (session->wbio); gssize written; - /* memory BIO ops generally can't fail: suppress compiler/coverity warnings */ - gint ignore_warning; if (tls_debug_level >= DEBUG_ASYNC_DETAIL_LEVEL) DEBUG (""); @@ -1528,7 +1525,7 @@ wocky_tls_session_write_ready (GObject *object, if (written == buffered) { DEBUG ("%d bytes written, clearing write BIO", buffered); - ignore_warning = BIO_reset (session->wbio); + (void) BIO_reset (session->wbio); wocky_tls_session_try_operation (session, WOCKY_TLS_OP_WRITE); } else @@ -1542,8 +1539,8 @@ wocky_tls_session_write_ready (GObject *object, { gchar *pending = g_memdup (buffer + written, psize); - ignore_warning = BIO_reset (session->wbio); - ignore_warning = BIO_write (session->wbio, pending, psize); + (void) BIO_reset (session->wbio); + (void) BIO_write (session->wbio, pending, psize); g_free (pending); } |