aboutsummaryrefslogtreecommitdiffstats
path: root/kbx/kbxutil.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2012-02-06 19:50:47 +0000
committerWerner Koch <[email protected]>2012-02-06 19:50:47 +0000
commiteb0faef81dae2cba1f62056fdc4dc2a7d58ac86a (patch)
tree7ada65b8c11f45aeb6beae3fce3959d4513c5ac3 /kbx/kbxutil.c
parentAlso let GENKEY and PKDECRYPT send the INQUIRE_MAXLEN status message. (diff)
downloadgnupg-eb0faef81dae2cba1f62056fdc4dc2a7d58ac86a.tar.gz
gnupg-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 '')
-rw-r--r--kbx/kbxutil.c4
1 files changed, 2 insertions, 2 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',