diff options
| author | NIIBE Yutaka <[email protected]> | 2018-07-12 08:09:14 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2018-07-12 08:09:14 +0000 |
| commit | e8caa282d3d5f286919a1ed3db6699c555b7e89d (patch) | |
| tree | 1762014bacef69c542923f55dfe83a2f925d7999 /common/util.h | |
| parent | g10: Fix enum_secret_keys for card keys. (diff) | |
| parent | gpg: Remove multiple subkey bindings during export-clean. (diff) | |
| download | gnupg-gniibe/decryption-key.tar.gz gnupg-gniibe/decryption-key.zip | |
Merge branch 'master' into gniibe/decryption-keygniibe/decryption-key
Diffstat (limited to 'common/util.h')
| -rw-r--r-- | common/util.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/common/util.h b/common/util.h index f3722812d..682415d92 100644 --- a/common/util.h +++ b/common/util.h @@ -39,21 +39,6 @@ * libgpg-error version. Define them here. * Example: (#if GPG_ERROR_VERSION_NUMBER < 0x011500 // 1.21) */ -#if GPG_ERROR_VERSION_NUMBER < 0x011a00 /* 1.26 */ -# define GPG_ERR_UNKNOWN_FLAG 309 -# define GPG_ERR_INV_ORDER 310 -# define GPG_ERR_ALREADY_FETCHED 311 -# define GPG_ERR_TRY_LATER 312 -# define GPG_ERR_SYSTEM_BUG 666 -# define GPG_ERR_DNS_UNKNOWN 711 -# define GPG_ERR_DNS_SECTION 712 -# define GPG_ERR_DNS_ADDRESS 713 -# define GPG_ERR_DNS_NO_QUERY 714 -# define GPG_ERR_DNS_NO_ANSWER 715 -# define GPG_ERR_DNS_CLOSED 716 -# define GPG_ERR_DNS_VERIFY 717 -# define GPG_ERR_DNS_TIMEOUT 718 -#endif /* Hash function used with libksba. */ @@ -216,6 +201,7 @@ char *hex2str_alloc (const char *hexstring, size_t *r_count); /*-- percent.c --*/ char *percent_plus_escape (const char *string); +char *percent_data_escape (const void *data, size_t datalen); char *percent_plus_unescape (const char *string, int nulrepl); char *percent_unescape (const char *string, int nulrepl); |