Clean up remaining uses of %llX for printing keyids

[onak.git] / keydb_file.c

diff --git a/keydb_file.c b/keydb_file.c
index 1ef81b473825818123d5c633cdeb10ae672383be..e99c26898af3385f2237fe7a86e613b850814846 100644 (file)
--- a/keydb_file.c
+++ b/keydb_file.c
@@ -31,7 +31,7 @@
  *
  *     This is just a no-op for flat file access.
  */
  *
  *     This is just a no-op for flat file access.
  */

-void initdb(bool readonly)
+static void file_initdb(bool readonly)

 {
 }
 
 {
 }
 


@@ -40,7 +40,7 @@ void initdb(bool readonly)
  *
  *     This is just a no-op for flat file access.
  */
  *
  *     This is just a no-op for flat file access.
  */

-void cleanupdb(void)
+static void file_cleanupdb(void)

 {
 }
 
 {
 }
 


@@ -49,7 +49,7 @@ void cleanupdb(void)
  *
  *     This is just a no-op for flat file access.
  */
  *
  *     This is just a no-op for flat file access.
  */

-bool starttrans(void)
+static bool file_starttrans(void)

 {
        return true;
 }
 {
        return true;
 }


@@ -59,7 +59,7 @@ bool starttrans(void)
  *
  *     This is just a no-op for flat file access.
  */
  *
  *     This is just a no-op for flat file access.
  */

-void endtrans(void)
+static void file_endtrans(void)

 {
        return;
 }
 {
        return;
 }


@@ -76,14 +76,14 @@ void endtrans(void)
  *     in and then parse_keys() to parse the packets into a publickey
  *     structure.
  */
  *     in and then parse_keys() to parse the packets into a publickey
  *     structure.
  */

-int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
+static int file_fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,

                bool intrans)
 {
        struct openpgp_packet_list *packets = NULL;
        char keyfile[1024];
        int fd = -1;
 
                bool intrans)
 {
        struct openpgp_packet_list *packets = NULL;
        char keyfile[1024];
        int fd = -1;
 

-       snprintf(keyfile, 1023, "%s/0x%llX", config.db_dir,
+       snprintf(keyfile, 1023, "%s/0x%" PRIX64, config.db_dir,

                        keyid & 0xFFFFFFFF);
        fd = open(keyfile, O_RDONLY); // | O_SHLOCK);
 
                        keyid & 0xFFFFFFFF);
        fd = open(keyfile, O_RDONLY); // | O_SHLOCK);
 


@@ -109,7 +109,8 @@ int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
  *     packets and then use write_openpgp_stream() to write the stream out to
  *     the file.
  */
  *     packets and then use write_openpgp_stream() to write the stream out to
  *     the file.
  */

-int store_key(struct openpgp_publickey *publickey, bool intrans, bool update)
+static int file_store_key(struct openpgp_publickey *publickey, bool intrans,
+               bool update)

 {
        struct openpgp_packet_list *packets = NULL;
        struct openpgp_packet_list *list_end = NULL;
 {
        struct openpgp_packet_list *packets = NULL;
        struct openpgp_packet_list *list_end = NULL;


@@ -117,7 +118,7 @@ int store_key(struct openpgp_publickey *publickey, bool intrans, bool update)
        char keyfile[1024];
        int fd = -1;
 
        char keyfile[1024];
        int fd = -1;
 

-       snprintf(keyfile, 1023, "%s/0x%llX", config.db_dir,
+       snprintf(keyfile, 1023, "%s/0x%" PRIX64, config.db_dir,

                        get_keyid(publickey) & 0xFFFFFFFF);
        fd = open(keyfile, O_WRONLY | O_CREAT, 0664); // | O_EXLOCK);
 
                        get_keyid(publickey) & 0xFFFFFFFF);
        fd = open(keyfile, O_WRONLY | O_CREAT, 0664); // | O_EXLOCK);
 


@@ -144,11 +145,11 @@ int store_key(struct openpgp_publickey *publickey, bool intrans, bool update)
  *     This function deletes a public key from whatever storage mechanism we
  *     are using. Returns 0 if the key existed.
  */
  *     This function deletes a public key from whatever storage mechanism we
  *     are using. Returns 0 if the key existed.
  */

-int delete_key(uint64_t keyid, bool intrans)
+static int file_delete_key(uint64_t keyid, bool intrans)

 {
        char keyfile[1024];
 
 {
        char keyfile[1024];
 

-       snprintf(keyfile, 1023, "%s/0x%llX", config.db_dir,
+       snprintf(keyfile, 1023, "%s/0x%" PRIX64, config.db_dir,

                        keyid & 0xFFFFFFFF);
 
        return unlink(keyfile);
                        keyid & 0xFFFFFFFF);
 
        return unlink(keyfile);


@@ -164,7 +165,8 @@ int delete_key(uint64_t keyid, bool intrans)
  *
  *     TODO: Write for flat file access. Some sort of grep?
  */
  *
  *     TODO: Write for flat file access. Some sort of grep?
  */

-int fetch_key_text(const char *search, struct openpgp_publickey **publickey)
+static int file_fetch_key_text(const char *search,
+               struct openpgp_publickey **publickey)

 {
        return 0;
 }
 {
        return 0;
 }


@@ -180,8 +182,8 @@ int fetch_key_text(const char *search, struct openpgp_publickey **publickey)
  *
  *     Returns the number of keys we iterated over.
  */
  *
  *     Returns the number of keys we iterated over.
  */

-int iterate_keys(void (*iterfunc)(void *ctx, struct openpgp_publickey *key),
-               void *ctx)
+static int file_iterate_keys(void (*iterfunc)(void *ctx,
+               struct openpgp_publickey *key), void *ctx)

 {
        int                         numkeys = 0;
        struct openpgp_packet_list *packets = NULL;
 {
        int                         numkeys = 0;
        struct openpgp_packet_list *packets = NULL;


@@ -228,22 +230,6 @@ int iterate_keys(void (*iterfunc)(void *ctx, struct openpgp_publickey *key),
        return numkeys;
 }
 
        return numkeys;
 }
 

-
-/**
- *     dumpdb - dump the key database
- *     @filenamebase: The base filename to use for the dump.
- *
- *     Dumps the database into one or more files, which contain pure OpenPGP
- *     that can be reimported into onak or gpg. filenamebase provides a base
- *     file name for the dump; several files may be created, all of which will
- *     begin with this string and then have a unique number and a .pgp
- *     extension.
- *          */
-int dumpdb(char *filenamebase)
-{
-       return 0;
-}
-

 /*
  * Include the basic keydb routines.
  */
 /*
  * Include the basic keydb routines.
  */


@@ -252,3 +238,20 @@ int dumpdb(char *filenamebase)
 #define NEED_GETFULLKEYID 1
 #define NEED_UPDATEKEYS 1
 #include "keydb.c"
 #define NEED_GETFULLKEYID 1
 #define NEED_UPDATEKEYS 1
 #include "keydb.c"

+
+struct dbfuncs keydb_file_funcs = {
+       .initdb                 = file_initdb,
+       .cleanupdb              = file_cleanupdb,
+       .starttrans             = file_starttrans,
+       .endtrans               = file_endtrans,
+       .fetch_key              = file_fetch_key,
+       .fetch_key_text         = file_fetch_key_text,
+       .store_key              = file_store_key,
+       .update_keys            = generic_update_keys,
+       .delete_key             = file_delete_key,
+       .getkeysigs             = generic_getkeysigs,
+       .cached_getkeysigs      = generic_cached_getkeysigs,
+       .keyid2uid              = generic_keyid2uid,
+       .getfullkeyid           = generic_getfullkeyid,
+       .iterate_keys           = file_iterate_keys,
+};