mirror of
git://git.gnupg.org/gnupg.git
synced 2024-11-10 21:38:50 +01:00
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@fsij.org>
This commit is contained in:
parent
6fbe12a51e
commit
ea9cfcfbf7
@ -1515,11 +1515,11 @@ iobuf_ioctl (iobuf_t a, iobuf_ioctl_t cmd, int intval, void *ptrval)
|
|||||||
log_debug ("iobuf-*.*: ioctl '%s' fsync\n",
|
log_debug ("iobuf-*.*: ioctl '%s' fsync\n",
|
||||||
ptrval? (const char*)ptrval:"<null>");
|
ptrval? (const char*)ptrval:"<null>");
|
||||||
|
|
||||||
if (!a && !intval && ptrval)
|
if (!a && !intval && ptrval)
|
||||||
{
|
{
|
||||||
return fd_cache_synchronize (ptrval);
|
return fd_cache_synchronize (ptrval);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
return -1;
|
return -1;
|
||||||
|
@ -825,18 +825,18 @@ encrypt_filter (void *opaque, int control,
|
|||||||
if (rc)
|
if (rc)
|
||||||
return rc;
|
return rc;
|
||||||
|
|
||||||
if(efx->symkey_s2k && efx->symkey_dek)
|
if(efx->symkey_s2k && efx->symkey_dek)
|
||||||
{
|
{
|
||||||
rc=write_symkey_enc(efx->symkey_s2k,efx->symkey_dek,
|
rc=write_symkey_enc(efx->symkey_s2k,efx->symkey_dek,
|
||||||
efx->cfx.dek,a);
|
efx->cfx.dek,a);
|
||||||
if(rc)
|
if(rc)
|
||||||
return 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);
|
rc = iobuf_write (a, buf, size);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -749,8 +749,8 @@ prepare_search (KEYRING_HANDLE hd)
|
|||||||
if (!hd->current.kr) {
|
if (!hd->current.kr) {
|
||||||
if (DBG_LOOKUP)
|
if (DBG_LOOKUP)
|
||||||
log_debug ("%s: keyring not available!\n", __func__);
|
log_debug ("%s: keyring not available!\n", __func__);
|
||||||
hd->current.eof = 1;
|
hd->current.eof = 1;
|
||||||
return -1; /* keyring not available */
|
return -1; /* keyring not available */
|
||||||
}
|
}
|
||||||
assert (!hd->current.iobuf);
|
assert (!hd->current.iobuf);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user