[Pkg-gnupg-commit] [gnupg2] 31/205: common, g10: Fix indentation to silence GCC-6.
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Wed May 11 08:38:11 UTC 2016
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch experimental
in repository gnupg2.
commit ea9cfcfbf76de232221f31787c53d5f46361a9f0
Author: NIIBE Yutaka <gniibe at fsij.org>
Date: Mon Feb 15 11:05:29 2016 +0900
common, g10: Fix indentation to silence GCC-6.
* common/iobuf.c (iobuf_ioctl): Fix.
* g10/encrypt.c (encrypt_filter): Likewise.
* g10/keyring.c (prepare_search): Likewise.
--
Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
---
common/iobuf.c | 10 +++++-----
g10/encrypt.c | 20 ++++++++++----------
g10/keyring.c | 4 ++--
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/common/iobuf.c b/common/iobuf.c
index 00d1b8d..f5bbfb2 100644
--- a/common/iobuf.c
+++ b/common/iobuf.c
@@ -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;
diff --git a/g10/encrypt.c b/g10/encrypt.c
index 46b0be0..49ec65b 100644
--- a/g10/encrypt.c
+++ b/g10/encrypt.c
@@ -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);
}
diff --git a/g10/keyring.c b/g10/keyring.c
index 7c7b355..ee079a9 100644
--- a/g10/keyring.c
+++ b/g10/keyring.c
@@ -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);
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git
More information about the Pkg-gnupg-commit
mailing list