From fd5f511b33ef2dcbd77793b5a8ed8e537c9752ff Mon Sep 17 00:00:00 2001
From: Benjamin Berg <bberg@redhat.com>
Date: Wed, 20 Nov 2019 11:19:14 +0100
Subject: [PATCH] nbis: Add patch to fix unused variable warning

With the spatch to use GLib memory functions a lot of error paths were
removed. This causes an unused variable warning, so drop in a further
patch to remove the unused variable.
---
 libfprint/nbis/glib-mem-warning.patch | 13 +++++++++++++
 libfprint/nbis/mindtct/shape.c        |  2 +-
 libfprint/nbis/update-from-nbis.sh    |  6 +++++-
 3 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 libfprint/nbis/glib-mem-warning.patch

diff --git a/libfprint/nbis/glib-mem-warning.patch b/libfprint/nbis/glib-mem-warning.patch
new file mode 100644
index 0000000..75b82b4
--- /dev/null
+++ b/libfprint/nbis/glib-mem-warning.patch
@@ -0,0 +1,13 @@
+diff --git a/libfprint/nbis/mindtct/shape.c b/libfprint/nbis/mindtct/shape.c
+index 28bc66c..c399f36 100644
+--- mindtct/shape.c
++++ mindtct/shape.c
+@@ -86,7 +86,7 @@ int alloc_shape(SHAPE **oshape, const int xmin, const int ymin,
+ {
+    SHAPE *shape;
+    int alloc_rows, alloc_pts;
+-   int i, j, y;
++   int i, y;
+ 
+    /* Compute allocation parameters. */
+    /* First, compute the number of scanlines spanned by the shape. */
diff --git a/libfprint/nbis/mindtct/shape.c b/libfprint/nbis/mindtct/shape.c
index 28bc66c..c399f36 100644
--- a/libfprint/nbis/mindtct/shape.c
+++ b/libfprint/nbis/mindtct/shape.c
@@ -86,7 +86,7 @@ int alloc_shape(SHAPE **oshape, const int xmin, const int ymin,
 {
    SHAPE *shape;
    int alloc_rows, alloc_pts;
-   int i, j, y;
+   int i, y;
 
    /* Compute allocation parameters. */
    /* First, compute the number of scanlines spanned by the shape. */
diff --git a/libfprint/nbis/update-from-nbis.sh b/libfprint/nbis/update-from-nbis.sh
index 4e243a2..c8cde80 100755
--- a/libfprint/nbis/update-from-nbis.sh
+++ b/libfprint/nbis/update-from-nbis.sh
@@ -180,4 +180,8 @@ sed -i 's/[ \t]*$//' `find -name "*.[ch]"`
 sed -i '/usebsd.h/d' `find -name "*.[ch]"`
 
 # Use GLib memory management
-spatch --sp-file glib-memory.cocci --dir . --in-place
\ No newline at end of file
+spatch --sp-file glib-memory.cocci --dir . --in-place
+
+# The above leaves an unused variable around, triggering a warning
+# remove it.
+patch -p0 < glib-mem-warning.patch
\ No newline at end of file