From: Jonathan Bastien-Filiatrault <joe@x2a.org>
Date: Sat, 25 Sep 2010 16:43:03 +0000 (-0400)
Subject: Harmonize "d" argument between constate.c and compress.c.
X-Git-Tag: gnutls_2_99_0~261
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=be09a50d4839d717fc16db2bbd0d91b4ede6a8fb;p=thirdparty%2Fgnutls.git

Harmonize "d" argument between constate.c and compress.c.

Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
---

diff --git a/lib/gnutls_constate.c b/lib/gnutls_constate.c
index 0546e92d32..511bc24f84 100644
--- a/lib/gnutls_constate.c
+++ b/lib/gnutls_constate.c
@@ -291,7 +291,7 @@ _gnutls_set_keys (gnutls_session_t session, record_parameters_st * params,
 }
 
 static int
-_gnutls_init_record_state (record_parameters_st * params, int ver, int read,
+_gnutls_init_record_state (record_parameters_st * params, int ver, int d,
                            record_state_st * state)
 {
   int ret;
@@ -309,7 +309,7 @@ _gnutls_init_record_state (record_parameters_st * params, int ver, int read,
     return gnutls_assert_val (ret);
 
   state->compression_state =
-    _gnutls_comp_init (params->compression_algorithm, read);
+    _gnutls_comp_init (params->compression_algorithm, d);
 
   if (state->compression_state == GNUTLS_COMP_FAILED)
     return gnutls_assert_val (GNUTLS_E_UNKNOWN_COMPRESSION_ALGORITHM);
@@ -783,7 +783,7 @@ _gnutls_epoch_gc (gnutls_session_t session)
 }
 
 static inline void
-free_record_state (record_state_st * state, int read)
+free_record_state (record_state_st * state, int d)
 {
   _gnutls_free_datum (&state->mac_secret);
   _gnutls_free_datum (&state->IV);
@@ -792,7 +792,7 @@ free_record_state (record_state_st * state, int read)
   _gnutls_auth_cipher_deinit (&state->cipher_state);
 
   if (state->compression_state != NULL)
-    _gnutls_comp_deinit (state->compression_state, read);
+    _gnutls_comp_deinit (state->compression_state, d);
 }
 
 void