security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-03-28 22:49:59 +01:00
Code Activity

gpg: Use the proper type.

Browse Source 
* g10/options.h: Include "tofu.h".
(opt.tofu_default_policy): Change type to enum tofu_policy.
* g10/gpgv.c (enum tofu_policy): Don't redeclare.
* g10/test-stubs.c (enum tofu_policy): Likewise.

--
Signed-off-by: Neal H. Walfield <neal@g10code.com>
This commit is contained in:
Neal H. Walfield 2015-10-21 20:24:27 +02:00
parent 8b06d7f41a
commit 3c4c89cc35
3 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
g10/gpgv.c
View File

@ -615,11 +615,6 @@ export_pubkey_buffer (ctrl_t ctrl, const char *keyspec, unsigned int options,
return gpg_error (GPG_ERR_NOT_IMPLEMENTED); return gpg_error (GPG_ERR_NOT_IMPLEMENTED);
} }
enum tofu_policy
{
tofu_policy
};
gpg_error_t gpg_error_t
tofu_get_policy (PKT_public_key *pk, PKT_user_id *user_id, tofu_get_policy (PKT_public_key *pk, PKT_user_id *user_id,
enum tofu_policy *policy) enum tofu_policy *policy)

5
g10/options.h
View File

@ -24,6 +24,7 @@
#include <types.h> #include <types.h>
#include "main.h" #include "main.h"
#include "packet.h" #include "packet.h"
#include "tofu.h"
#include "../common/session-env.h" #include "../common/session-env.h"
#ifndef EXTERN_UNLESS_MAIN_MODULE #ifndef EXTERN_UNLESS_MAIN_MODULE
@ -125,9 +126,7 @@ struct
{ {
TOFU_DB_AUTO=0, TOFU_DB_SPLIT, TOFU_DB_FLAT TOFU_DB_AUTO=0, TOFU_DB_SPLIT, TOFU_DB_FLAT
} tofu_db_format; } tofu_db_format;
/* TOFU_BINDING_BAD, TOFU_BINDING_ASK, TOFU_BINDING_AUTO, or enum tofu_policy tofu_default_policy;
TOFU_BINDING_GOOD. */
int tofu_default_policy;
int force_ownertrust; int force_ownertrust;
enum enum
{ {

5
g10/test-stubs.c
View File

@ -429,11 +429,6 @@ export_pubkey_buffer (ctrl_t ctrl, const char *keyspec, unsigned int options,
return gpg_error (GPG_ERR_NOT_IMPLEMENTED); return gpg_error (GPG_ERR_NOT_IMPLEMENTED);
} }
enum tofu_policy
{
tofu_policy
};
gpg_error_t gpg_error_t
tofu_get_policy (PKT_public_key *pk, PKT_user_id *user_id, tofu_get_policy (PKT_public_key *pk, PKT_user_id *user_id,
enum tofu_policy *policy) enum tofu_policy *policy)