security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00
Code Activity

kbx: Use wrapper functions for es_fclose and es_fopen.

Browse source 
* kbx/keybox-defs.h (KEYBOX_LL_OPEN_READ)
(KEYBOX_LL_OPEN_UPDATE, KEYBOX_LL_OPEN_CREATE): New.
* kbx/keybox-init.c (_keybox_ll_open): New.  Replace all keybox use of
es_fopen by this function.
(_keybox_ll_close): New.  Replace all keybox use of es_fclose by this
function.
--

Note that this has not been done for the utilities and the backend-kbx
of keyboxd.
This commit is contained in:
Werner Koch 2023-05-05 11:37:44 +02:00
parent a7dbf11954
commit a6c4d6413a
No known key found for this signature in database
GPG key ID: E3FDFF218E45B72B
4 changed files with 120 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

30
kbx/keybox-search.c
View file

@ -873,28 +873,12 @@ release_sn_array (struct sn_array_s *array, size_t size)
}
/* Helper to open the file. */
static gpg_error_t
open_file (KEYBOX_HANDLE hd)
{
hd->fp = es_fopen (hd->kb->fname, "rb,sysopen,sequential");
if (!hd->fp)
{
hd->error = gpg_error_from_syserror ();
return hd->error;
}
return 0;
}
/*
The search API
*/
*
* The search API
*
*/
gpg_error_t
keybox_search_reset (KEYBOX_HANDLE hd)
@ -914,7 +898,7 @@ keybox_search_reset (KEYBOX_HANDLE hd)
{
/* Ooops. Seek did not work. Close so that the search will
* open the file again. */
es_fclose (hd->fp);
_keybox_ll_close (hd->fp);
hd->fp = NULL;
}
}
@ -992,7 +976,7 @@ keybox_search (KEYBOX_HANDLE hd, KEYBOX_SEARCH_DESC *desc, size_t ndesc,
if (!hd->fp)
{
rc = open_file (hd);
rc = _keybox_ll_open (&hd->fp, hd->kb->fname, 0);
if (rc)
{
xfree (sn_array);
@ -1480,7 +1464,7 @@ keybox_seek (KEYBOX_HANDLE hd, off_t offset)
return 0;
}
err = open_file (hd);
err = _keybox_ll_open (&hd->fp, hd->kb->fname, 0);
if (err)
return err;
}