aboutsummaryrefslogtreecommitdiffstats
path: root/g13
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2015-04-06 11:42:17 +0000
committerWerner Koch <[email protected]>2015-04-06 11:42:17 +0000
commit24a75201da6be72edf85b96dbc0c01c747d02c6a (patch)
treeded5739c5a3d8a1ad6c241732809aefdb1555f59 /g13
parentFix use of DBG_CACHE and DBG_LOOKUP (diff)
downloadgnupg-24a75201da6be72edf85b96dbc0c01c747d02c6a.tar.gz
gnupg-24a75201da6be72edf85b96dbc0c01c747d02c6a.zip
Rename DBG_ASSUAN to DBG_IPC and add separate DBG_EXTPROG.
* g10/options.h (DBG_EXTPROG_VALUE): Separate from DBG_IPC_VALUE.
Diffstat (limited to 'g13')
-rw-r--r--g13/call-gpg.c2
-rw-r--r--g13/g13.c8
-rw-r--r--g13/g13.h4
3 files changed, 7 insertions, 7 deletions
diff --git a/g13/call-gpg.c b/g13/call-gpg.c
index 54f6056d5..0bd935c1f 100644
--- a/g13/call-gpg.c
+++ b/g13/call-gpg.c
@@ -136,7 +136,7 @@ start_gpg (ctrl_t ctrl, int input_fd, int output_fd, assuan_context_t *r_ctx)
*r_ctx = ctx;
- if (DBG_ASSUAN)
+ if (DBG_IPC)
log_debug ("connection to GPG established\n");
return 0;
}
diff --git a/g13/g13.c b/g13/g13.c
index 157e6465d..2e4e63d99 100644
--- a/g13/g13.c
+++ b/g13/g13.c
@@ -260,11 +260,11 @@ set_debug (void)
else if (!strcmp (debug_level, "none") || (numok && numlvl < 1))
opt.debug = 0;
else if (!strcmp (debug_level, "basic") || (numok && numlvl <= 2))
- opt.debug = DBG_ASSUAN_VALUE|DBG_MOUNT_VALUE;
+ opt.debug = DBG_IPC_VALUE|DBG_MOUNT_VALUE;
else if (!strcmp (debug_level, "advanced") || (numok && numlvl <= 5))
- opt.debug = DBG_ASSUAN_VALUE|DBG_MOUNT_VALUE;
+ opt.debug = DBG_IPC_VALUE|DBG_MOUNT_VALUE;
else if (!strcmp (debug_level, "expert") || (numok && numlvl <= 8))
- opt.debug = (DBG_ASSUAN_VALUE|DBG_MOUNT_VALUE|DBG_CRYPTO_VALUE);
+ opt.debug = (DBG_IPC_VALUE|DBG_MOUNT_VALUE|DBG_CRYPTO_VALUE);
else if (!strcmp (debug_level, "guru") || numok)
{
opt.debug = ~0;
@@ -294,7 +294,7 @@ set_debug (void)
(opt.debug & DBG_CRYPTO_VALUE )? " crypto":"",
(opt.debug & DBG_MEMORY_VALUE )? " memory":"",
(opt.debug & DBG_MEMSTAT_VALUE)? " memstat":"",
- (opt.debug & DBG_ASSUAN_VALUE )? " assuan":"");
+ (opt.debug & DBG_IPC_VALUE )? " ipc":"");
}
diff --git a/g13/g13.h b/g13/g13.h
index bdcc02ae5..371833d84 100644
--- a/g13/g13.h
+++ b/g13/g13.h
@@ -70,12 +70,12 @@ struct
#define DBG_CRYPTO_VALUE 4 /* Debug low level crypto. */
#define DBG_MEMORY_VALUE 32 /* Debug memory allocation stuff. */
#define DBG_MEMSTAT_VALUE 128 /* Show memory statistics. */
-#define DBG_ASSUAN_VALUE 1024 /* Debug assuan communication. */
+#define DBG_IPC_VALUE 1024 /* Debug assuan communication. */
#define DBG_MOUNT (opt.debug & DBG_MOUNT_VALUE)
#define DBG_CRYPTO (opt.debug & DBG_CRYPTO_VALUE)
#define DBG_MEMORY (opt.debug & DBG_MEMORY_VALUE)
-#define DBG_ASSUAN (opt.debug & DBG_ASSUAN_VALUE)
+#define DBG_IPC (opt.debug & DBG_IPC_VALUE)
/* Forward declaration for an object defined in server.c. */
struct server_local_s;