Don't redefine a local variable.

2 files changed, 33 insertions, 1 deletions

diff --git a/databases/metakit-lib/distinfo b/databases/metakit-lib/distinfo
index 41d38552a15..830b7c22757 100644
--- a/databases/metakit-lib/distinfo
+++ b/databases/metakit-lib/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.8 2009/02/11 21:00:13 joerg Exp $
+$NetBSD: distinfo,v 1.9 2012/11/16 00:40:44 joerg Exp $
 
 SHA1 (metakit-2.4.9.7.tar.gz) = 1b75400038fcad941886deb0748e669c224bc995
 RMD160 (metakit-2.4.9.7.tar.gz) = e563c2187e66ed7a8ea0e9a16971e6ce777e3088
 Size (metakit-2.4.9.7.tar.gz) = 868310 bytes
 SHA1 (patch-ab) = 74a987a807844460cee9b13cd06578529911c68e
+SHA1 (patch-python_PyView.cpp) = 48d9062f9dd2c77b6e4686c2fc328265307b16e4
diff --git a/databases/metakit-lib/patches/patch-python_PyView.cpp b/databases/metakit-lib/patches/patch-python_PyView.cpp
new file mode 100644
index 00000000000..dde9bda6c39
--- /dev/null
+++ b/databases/metakit-lib/patches/patch-python_PyView.cpp
@@ -0,0 +1,31 @@
+$NetBSD: patch-python_PyView.cpp,v 1.1 2012/11/16 00:40:44 joerg Exp $
+
+--- python/PyView.cpp.orig	2012-11-15 14:50:12.000000000 +0000
++++ python/PyView.cpp
+@@ -631,19 +631,19 @@ static PyObject *PyView_access(PyView *o
+     }
+ 
+     PyObject *buffer = PyString_FromStringAndSize(0, length);
+-    int o = 0;
++    int o2 = 0;
+ 
+-    while (o < length) {
+-      c4_Bytes buf = prop(row).Access(offset + o, length - o);
++    while (o2 < length) {
++      c4_Bytes buf = prop(row).Access(offset + o2, length - o2);
+       int n = buf.Size();
+       if (n == 0)
+         break;
+-      memcpy(PyString_AS_STRING(buffer) + o, buf.Contents(), n);
+-      o += n;
++      memcpy(PyString_AS_STRING(buffer) + o2, buf.Contents(), n);
++      o2 += n;
+     }
+ 
+-    if (o < length)
+-      _PyString_Resize(&buffer, o);
++    if (o2 < length)
++      _PyString_Resize(&buffer, o2);
+ 
+     return buffer;
+   } catch (...) {