From: Neil E. Hodges <47hasbegun@gmail.com>
Date: Sat, 30 Apr 2011 20:15:36 +0000 (-0700)
Subject: Fix compile error using GCC 4.6.
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=64abc2f4a3678abf9e1b6962e6eb2ef1c0bcd945;p=packages%2Fb%2Fbup.git

Fix compile error using GCC 4.6.
---

diff --git a/lib/bup/_helpers.c b/lib/bup/_helpers.c
index 61b73f7..5424643 100644
--- a/lib/bup/_helpers.c
+++ b/lib/bup/_helpers.c
@@ -369,7 +369,7 @@ static PyObject *merge_into(PyObject *self, PyObject *args)
 {
     PyObject *ilist = NULL;
     unsigned char *fmap = NULL;
-    struct sha *sha_ptr, *sha_start, *last = NULL;
+    struct sha *sha_ptr, *sha_start = NULL;
     uint32_t *table_ptr, *name_ptr, *name_start;
     struct idx **idxs = NULL;
     int flen = 0, bits = 0, i;
@@ -418,7 +418,6 @@ static PyObject *merge_into(PyObject *self, PyObject *args)
 	    table_ptr[prefix++] = htonl(count);
 	memcpy(sha_ptr++, idx->cur, sizeof(struct sha));
 	*name_ptr++ = htonl(_get_idx_i(idx));
-	last = idx->cur;
 	++idx->cur;
 	if (idx->cur_name != NULL)
 	    ++idx->cur_name;