diff options
| author | NIIBE Yutaka <[email protected]> | 2016-02-15 02:05:29 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2016-02-15 02:05:29 +0000 |
| commit | ea9cfcfbf76de232221f31787c53d5f46361a9f0 (patch) | |
| tree | 197fd0dc76c9758b970e04b8acd2f5d4e39b38d8 | |
| parent | dirmngr: fix for memory alignment. (diff) | |
| download | gnupg-ea9cfcfbf76de232221f31787c53d5f46361a9f0.tar.gz gnupg-ea9cfcfbf76de232221f31787c53d5f46361a9f0.zip | |
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 <[email protected]>
Diffstat (limited to '')
| -rw-r--r-- | common/iobuf.c | 10 | ||||
| -rw-r--r-- | g10/encrypt.c | 20 | ||||
| -rw-r--r-- | g10/keyring.c | 4 |
3 files changed, 17 insertions, 17 deletions
diff --git a/common/iobuf.c b/common/iobuf.c index 00d1b8d26..f5bbfb2d2 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 46b0be0cc..49ec65b4a 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 7c7b35508..ee079a95f 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); } |