about summary refs log tree commit diff stats
path: root/src/LYStrings.c
diff options
context:
space:
mode:
authorThomas E. Dickey <dickey@invisible-island.net>2007-05-23 00:57:49 -0400
committerThomas E. Dickey <dickey@invisible-island.net>2007-05-23 00:57:49 -0400
commitfa5da88cfe856e4c69d3dfb12e68bb56d0c69c9e (patch)
tree20ce131d19588fd97676f6d73b4ded257625d2f4 /src/LYStrings.c
parente43d228f7636bbb423c5bdbd2100d733bcee28d3 (diff)
downloadlynx-snapshots-fa5da88cfe856e4c69d3dfb12e68bb56d0c69c9e.tar.gz
snapshot of project "lynx", label v2-8-7dev_5a
Diffstat (limited to 'src/LYStrings.c')
-rw-r--r--src/LYStrings.c21
1 files changed, 13 insertions, 8 deletions
diff --git a/src/LYStrings.c b/src/LYStrings.c
index ca9e18c5..d7c5acef 100644
--- a/src/LYStrings.c
+++ b/src/LYStrings.c
@@ -1,3 +1,4 @@
+/* $LynxId: LYStrings.c,v 1.126 2007/05/23 00:30:24 tom Exp $ */
 #include <HTUtils.h>
 #include <HTCJK.h>
 #include <UCAux.h>
@@ -1232,45 +1233,49 @@ static char *skip_keysym(char *parse)
  * The first token is the string to define, the second is the name (of the
  * keysym) to define it to.
  */
+#define MY_TRACE(p) CTRACE2(TRACE_CFG, p)
+
 static int setkey_cmd(char *parse)
 {
     char *s, *t;
     int keysym;
     char buf[BUFSIZ];
 
-    CTRACE((tfp, "KEYMAP(PA): in=%s", parse));	/* \n-terminated */
+    MY_TRACE((tfp, "KEYMAP(PA): in=%s", parse));	/* \n-terminated */
     if ((s = skip_keysym(parse)) != 0) {
 	if (isspace(UCH(*s))) {
 	    *s++ = '\0';
 	    s = LYSkipBlanks(s);
 	    if ((t = skip_keysym(s)) == 0) {
-		CTRACE((tfp, "KEYMAP(SKIP) no key expansion found\n"));
+		MY_TRACE((tfp, "KEYMAP(SKIP) no key expansion found\n"));
 		return -1;
 	    }
 	    if (t != s)
 		*t = '\0';
 	    if (map_string_to_keysym(s, &keysym) >= 0) {
 		if (!unescape_string(parse, buf, buf + sizeof(buf) - 1)) {
-		    CTRACE((tfp, "KEYMAP(SKIP) could unescape key\n"));
+		    MY_TRACE((tfp, "KEYMAP(SKIP) could unescape key\n"));
 		    return 0;	/* Trace the failure and continue. */
 		}
 		if (LYTraceLogFP == 0) {
-		    CTRACE((tfp, "KEYMAP(DEF) keysym=%#x\n", keysym));
+		    MY_TRACE((tfp, "KEYMAP(DEF) keysym=%#x\n", keysym));
 		} else {
-		    CTRACE((tfp, "KEYMAP(DEF) keysym=%#x, seq='%s'\n", keysym, buf));
+		    MY_TRACE((tfp, "KEYMAP(DEF) keysym=%#x, seq='%s'\n",
+			      keysym, buf));
 		}
 		return define_key(buf, keysym);
 	    } else {
-		CTRACE((tfp, "KEYMAP(SKIP) could not map to keysym\n"));
+		MY_TRACE((tfp, "KEYMAP(SKIP) could not map to keysym\n"));
 	    }
 	} else {
-	    CTRACE((tfp, "KEYMAP(SKIP) junk after key description: '%s'\n", s));
+	    MY_TRACE((tfp, "KEYMAP(SKIP) junk after key description: '%s'\n", s));
 	}
     } else {
-	CTRACE((tfp, "KEYMAP(SKIP) no key description\n"));
+	MY_TRACE((tfp, "KEYMAP(SKIP) no key description\n"));
     }
     return -1;
 }
+#undef MY_TRACE
 
 static int unsetkey_cmd(char *parse)
 {