From 76d422cc0fc23e2cc7116a3fd6a23056ae161ad4 Mon Sep 17 00:00:00 2001
From: lericson <ludvig@lericson.se>
Date: Mon, 10 May 2010 13:24:07 +0200
Subject: [PATCH] Fix what seems to be merge-related issues

---
 _pylibmcmodule.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/_pylibmcmodule.c b/_pylibmcmodule.c
index 52051c2..47b17ec 100644
--- a/_pylibmcmodule.c
+++ b/_pylibmcmodule.c
@@ -165,6 +165,7 @@ error:
 #ifdef USE_ZLIB
 static int _PylibMC_Deflate(char* value, size_t value_len,
                     char** result, size_t *result_len) {
+    int rc;
     /* todo: failures in here are entirely silent. this should probably
        be fixed */
 
@@ -684,11 +685,6 @@ static bool _PylibMC_RunSetCommand(PylibMC_Client* self,
     bool allsuccess = true;
 
     Py_BEGIN_ALLOW_THREADS;
-    rc = f(self->mc, key, key_sz,
-           PyString_AS_STRING(store_val), PyString_GET_SIZE(store_val),
-           time, store_flags);
-    Py_END_ALLOW_THREADS;
-    Py_DECREF(store_val);
 
     for(pos=0; pos < nkeys && !error; pos++) {
       pylibmc_mset* mset = &msets[pos];