From eb0faef81dae2cba1f62056fdc4dc2a7d58ac86a Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Mon, 6 Feb 2012 20:50:47 +0100 Subject: 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. --- agent/gpg-agent.c | 2 ++ agent/preset-passphrase.c | 1 + agent/protect-tool.c | 1 + 3 files changed, 4 insertions(+) (limited to 'agent') diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c index bc5a6cd1b..3a868676b 100644 --- a/agent/gpg-agent.c +++ b/agent/gpg-agent.c @@ -52,6 +52,8 @@ #include "exechelp.h" #include "asshelp.h" #include "../include/cipher.h" /* for PUBKEY_ALGO_ECDSA, PUBKEY_ALGO_ECDH */ +#include "../common/init.h" + enum cmd_and_opt_values { aNull = 0, diff --git a/agent/preset-passphrase.c b/agent/preset-passphrase.c index f303d5b7f..3f7933638 100644 --- a/agent/preset-passphrase.c +++ b/agent/preset-passphrase.c @@ -46,6 +46,7 @@ #include "simple-pwquery.h" #include "i18n.h" #include "sysutils.h" +#include "../common/init.h" enum cmd_and_opt_values diff --git a/agent/protect-tool.c b/agent/protect-tool.c index a2531438c..57842a083 100644 --- a/agent/protect-tool.c +++ b/agent/protect-tool.c @@ -43,6 +43,7 @@ #include "i18n.h" #include "get-passphrase.h" #include "sysutils.h" +#include "../common/init.h" enum cmd_and_opt_values -- cgit v1.2.3