diff options
| author | Werner Koch <wk@gnupg.org> | 2012-02-06 20:50:47 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2012-02-06 20:50:47 +0100 |
| commit | eb0faef81dae2cba1f62056fdc4dc2a7d58ac86a (patch) | |
| tree | 7ada65b8c11f45aeb6beae3fce3959d4513c5ac3 /kbx | |
| parent | Also let GENKEY and PKDECRYPT send the INQUIRE_MAXLEN status message. (diff) | |
| download | gnupg2-eb0faef81dae2cba1f62056fdc4dc2a7d58ac86a.tar.xz gnupg2-eb0faef81dae2cba1f62056fdc4dc2a7d58ac86a.zip | |
common: Add a global variable to for the default error source.
For the shared code parts it is cumbersome to pass an error sourse
variable to each function. Its value is always a constant for a given
binary and thus a global variable makes things a lot easier than the
former macro stuff.
* common/init.c (default_errsource): New global var.
(init_common_subsystems): Rename to _init_common_subsystems. Set
DEFAULT_ERRSOURCE.
* common/init.h: Assert value of GPG_ERR_SOURCE_DEFAULT.
(init_common_subsystems): New macro.
* common/util.h (default_errsource): Add declaration.
* kbx/keybox-defs.h: Add some GPG_ERR_SOURCE_DEFAULT trickery.
Diffstat (limited to 'kbx')
| -rw-r--r-- | kbx/kbxutil.c | 4 | ||||
| -rw-r--r-- | kbx/keybox-defs.h | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/kbx/kbxutil.c b/kbx/kbxutil.c index 333c28695..9762add2a 100644 --- a/kbx/kbxutil.c +++ b/kbx/kbxutil.c @@ -34,11 +34,11 @@ #include "../common/stringhelp.h" #include "../common/utf8conv.h" #include "i18n.h" -#include "init.h" #include "keybox-defs.h" - +#include "../common/init.h" #include <gcrypt.h> + enum cmd_and_opt_values { aNull = 0, oArmor = 'a', diff --git a/kbx/keybox-defs.h b/kbx/keybox-defs.h index aad07f9d6..9a2930239 100644 --- a/kbx/keybox-defs.h +++ b/kbx/keybox-defs.h @@ -21,9 +21,12 @@ #define KEYBOX_DEFS_H 1 #ifdef GPG_ERR_SOURCE_DEFAULT -#error GPG_ERR_SOURCE_DEFAULT already defined +# if GPG_ERR_SOURCE_DEFAULT != GPG_ERR_SOURCE_KEYBOX +# error GPG_ERR_SOURCE_DEFAULT already defined +# endif +#else +# define GPG_ERR_SOURCE_DEFAULT GPG_ERR_SOURCE_KEYBOX #endif -#define GPG_ERR_SOURCE_DEFAULT GPG_ERR_SOURCE_KEYBOX #include <gpg-error.h> #define map_assuan_err(a) \ map_assuan_err_with_source (GPG_ERR_SOURCE_DEFAULT, (a)) |