[PATCH v2 01/12] secur32: Remove unused argument from buffer iteration helpers.

[Nikolay Sivov]

From: Nikolay Sivov <nsivov at codeweavers.com>

Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
 dlls/secur32/schannel_gnutls.c | 28 ++++++++++++++--------------
 dlls/secur32/secur32_priv.h    |  4 +---
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c
index 2e462b409d8..a79ca7040a5 100644
--- a/dlls/secur32/schannel_gnutls.c
+++ b/dlls/secur32/schannel_gnutls.c
@@ -211,7 +211,7 @@ static void compat_gnutls_dtls_set_timeouts(gnutls_session_t session, unsigned i
 }
 
 static void init_schan_buffers(struct schan_buffers *s, const PSecBufferDesc desc,
-        int (*get_next_buffer)(const struct schan_transport *, struct schan_buffers *))
+        int (*get_next_buffer)(struct schan_buffers *))
 {
     s->offset = 0;
     s->limit = ~0UL;
@@ -236,14 +236,14 @@ static int schan_find_sec_buffer_idx(const SecBufferDesc *desc, unsigned int sta
     return -1;
 }
 
-static int handshake_get_next_buffer(const struct schan_transport *t, struct schan_buffers *s)
+static int handshake_get_next_buffer(struct schan_buffers *s)
 {
     if (s->current_buffer_idx != -1)
         return -1;
     return schan_find_sec_buffer_idx(s->desc, 0, SECBUFFER_TOKEN);
 }
 
-static int handshake_get_next_buffer_alloc(const struct schan_transport *t, struct schan_buffers *s)
+static int handshake_get_next_buffer_alloc(struct schan_buffers *s)
 {
     if (s->current_buffer_idx == -1)
     {
@@ -262,7 +262,7 @@ static int handshake_get_next_buffer_alloc(const struct schan_transport *t, stru
     return -1;
 }
 
-static int send_message_get_next_buffer(const struct schan_transport *t, struct schan_buffers *s)
+static int send_message_get_next_buffer(struct schan_buffers *s)
 {
     SecBuffer *b;
 
@@ -280,7 +280,7 @@ static int send_message_get_next_buffer(const struct schan_transport *t, struct
     return -1;
 }
 
-static int send_message_get_next_buffer_token(const struct schan_transport *t, struct schan_buffers *s)
+static int send_message_get_next_buffer_token(struct schan_buffers *s)
 {
     SecBuffer *b;
 
@@ -307,14 +307,14 @@ static int send_message_get_next_buffer_token(const struct schan_transport *t, s
     return -1;
 }
 
-static int recv_message_get_next_buffer(const struct schan_transport *t, struct schan_buffers *s)
+static int recv_message_get_next_buffer(struct schan_buffers *s)
 {
     if (s->current_buffer_idx != -1)
         return -1;
     return schan_find_sec_buffer_idx(s->desc, 0, SECBUFFER_DATA);
 }
 
-static char *get_buffer(const struct schan_transport *t, struct schan_buffers *s, SIZE_T *count)
+static char *get_buffer(struct schan_buffers *s, SIZE_T *count)
 {
     SIZE_T max_count;
     PSecBuffer buffer;
@@ -328,7 +328,7 @@ static char *get_buffer(const struct schan_transport *t, struct schan_buffers *s
     if (s->current_buffer_idx == -1)
     {
         /* Initial buffer */
-        int buffer_idx = s->get_next_buffer(t, s);
+        int buffer_idx = s->get_next_buffer(s);
         if (buffer_idx == -1)
         {
             TRACE("No next buffer\n");
@@ -349,7 +349,7 @@ static char *get_buffer(const struct schan_transport *t, struct schan_buffers *s
     {
         int buffer_idx;
 
-        buffer_idx = s->get_next_buffer(t, s);
+        buffer_idx = s->get_next_buffer(s);
         if (buffer_idx == -1)
         {
             TRACE("No next buffer\n");
@@ -380,7 +380,7 @@ static ssize_t pull_adapter(gnutls_transport_ptr_t transport, void *buff, size_t
 
     TRACE("Pull %lu bytes\n", len);
 
-    b = get_buffer(t, &t->in, &len);
+    b = get_buffer(&t->in, &len);
     if (!b)
     {
         pgnutls_transport_set_errno(s, EAGAIN);
@@ -401,7 +401,7 @@ static ssize_t push_adapter(gnutls_transport_ptr_t transport, const void *buff,
 
     TRACE("Push %lu bytes\n", len);
 
-    b = get_buffer(t, &t->out, &len);
+    b = get_buffer(&t->out, &len);
     if (!b)
     {
         pgnutls_transport_set_errno(s, EAGAIN);
@@ -471,7 +471,7 @@ static int pull_timeout(gnutls_transport_ptr_t transport, unsigned int timeout)
 
     TRACE("\n");
 
-    if (get_buffer(t, &t->in, &count)) return 1;
+    if (get_buffer(&t->in, &count)) return 1;
 
     return 0;
 }
@@ -856,7 +856,7 @@ static NTSTATUS schan_send( void *args )
         {
             SIZE_T count = 0;
 
-            if (get_buffer(t, &t->out, &count)) continue;
+            if (get_buffer(&t->out, &count)) continue;
             return SEC_I_CONTINUE_NEEDED;
         }
         else
@@ -893,7 +893,7 @@ static NTSTATUS schan_recv( void *args )
         {
             SIZE_T count = 0;
 
-            if (!get_buffer(t, &t->in, &count)) break;
+            if (!get_buffer(&t->in, &count)) break;
         }
         else if (ret == GNUTLS_E_REHANDSHAKE)
         {
diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h
index e58303a4e1b..fcc007f77ef 100644
--- a/dlls/secur32/secur32_priv.h
+++ b/dlls/secur32/secur32_priv.h
@@ -88,8 +88,6 @@ typedef struct schan_credentials
     DWORD enabled_protocols;
 } schan_credentials;
 
-struct schan_transport;
-
 struct schan_buffers
 {
     SIZE_T offset;
@@ -97,7 +95,7 @@ struct schan_buffers
     const SecBufferDesc *desc;
     SecBuffer *alloc_buffer;
     int current_buffer_idx;
-    int (*get_next_buffer)(const struct schan_transport *, struct schan_buffers *);
+    int (*get_next_buffer)(struct schan_buffers *);
 };
 
 struct schan_transport
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/160