common, g10: Fix indentation to silence GCC-6.
authorNIIBE Yutaka <gniibe@fsij.org>
Mon, 15 Feb 2016 02:05:29 +0000 (11:05 +0900)
committerNIIBE Yutaka <gniibe@fsij.org>
Mon, 15 Feb 2016 02:05:29 +0000 (11:05 +0900)
* common/iobuf.c (iobuf_ioctl): Fix.
* g10/encrypt.c (encrypt_filter): Likewise.
* g10/keyring.c (prepare_search): Likewise.

--

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
common/iobuf.c
g10/encrypt.c
g10/keyring.c

index 00d1b8d..f5bbfb2 100644 (file)
@@ -1515,11 +1515,11 @@ iobuf_ioctl (iobuf_t a, iobuf_ioctl_t cmd, int intval, void *ptrval)
         log_debug ("iobuf-*.*: ioctl '%s' fsync\n",
                    ptrval? (const char*)ptrval:"<null>");
 
-       if (!a && !intval && ptrval)
-         {
-           return fd_cache_synchronize (ptrval);
-         }
-      }
+      if (!a && !intval && ptrval)
+        {
+          return fd_cache_synchronize (ptrval);
+        }
+    }
 
 
   return -1;
index 46b0be0..49ec65b 100644 (file)
@@ -825,18 +825,18 @@ encrypt_filter (void *opaque, int control,
           if (rc)
             return rc;
 
-           if(efx->symkey_s2k && efx->symkey_dek)
-             {
-               rc=write_symkey_enc(efx->symkey_s2k,efx->symkey_dek,
-                                   efx->cfx.dek,a);
-               if(rc)
-                 return rc;
-             }
+          if(efx->symkey_s2k && efx->symkey_dek)
+            {
+              rc=write_symkey_enc(efx->symkey_s2k,efx->symkey_dek,
+                                  efx->cfx.dek,a);
+              if(rc)
+                return rc;
+            }
 
-           iobuf_push_filter (a, cipher_filter, &efx->cfx);
+          iobuf_push_filter (a, cipher_filter, &efx->cfx);
 
-           efx->header_okay = 1;
-       }
+          efx->header_okay = 1;
+        }
       rc = iobuf_write (a, buf, size);
 
     }
index 7c7b355..ee079a9 100644 (file)
@@ -749,8 +749,8 @@ prepare_search (KEYRING_HANDLE hd)
         if (!hd->current.kr) {
           if (DBG_LOOKUP)
             log_debug ("%s: keyring not available!\n", __func__);
-            hd->current.eof = 1;
-            return -1; /* keyring not available */
+          hd->current.eof = 1;
+          return -1; /* keyring not available */
         }
         assert (!hd->current.iobuf);
     }