Bug#811933: geis: FTBFS with GCC 6: statement indented as if it were guarded by

[Sean Whitton]

control: retitle -1 geis: FTBFS with GCC 6: statement indented as if it were 
guarded by
control: tag -1 +patch

Hello,

I couldn't reproduce the build error above, presumably because GCC or
Debian has changed its defaults so that unused-const-variable is no
longer a build error.  However, building with the current gcc-6 in sid
yields the following error instead:

    geis_subscription.c: In function ‘geis_subscription_bag_empty’:
    geis_subscription.c:240:5: error: this ‘if’ clause does not guard... 
[-Werror=misleading-indentation]
         if (bag->sub_store[i])
         ^~
    geis_subscription.c:242:7: note: ...this statement, but the latter is 
misleadingly indented as if it is guarded by the ‘if’
           bag->sub_store[i] = NULL;
           ^~~

I have attached a patch to fix this.

-- 
Sean Whitton

Description: Fix misleading indentation to fix build with gcc-6
Author: Sean Whitton <spwhit...@spwhitton.name>
Bug-Debian: https://bugs.debian.org/811933
Forwarded: https://bugs.launchpad.net/geis/+bug/1608086
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/libgeis/geis_subscription.c
+++ b/libgeis/geis_subscription.c
@@ -238,8 +238,10 @@ geis_subscription_bag_empty(GeisSubBag b
   for (i = 0; i < bag->sub_store_size; ++i)
   {
     if (bag->sub_store[i])
+    {
       _subscription_unref(bag->sub_store[i]);
       bag->sub_store[i] = NULL;
+    }
   }
 }
 

signature.asc
Description: PGP signature