summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsabetts <sabetts>2006-04-29 15:34:14 +0000
committersabetts <sabetts>2006-04-29 15:34:14 +0000
commitcad59769b61b4ccd618f72355d1011eaf0008b96 (patch)
tree829036de11ca152cb17af6935db6d0547126bb59 /src
parent36f998eb7c667d913cc398881b3b304f242898d8 (diff)
downloadratpoison-cad59769b61b4ccd618f72355d1011eaf0008b96.zip
* src/bar.c (marked_message): print NULL if msg is null in debug output
* src/actions.c (cmd_getenv): return an empty string for nonexistant env vars. (command): print NULL if rest is null in debug output
Diffstat (limited to 'src')
-rw-r--r--src/actions.c2
-rw-r--r--src/bar.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/actions.c b/src/actions.c
index 216432c..332f5b8 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -2324,7 +2324,7 @@ command (int interactive, char *data)
rest = strtok (NULL, "\0");
- PRINT_DEBUG (("cmd==%s rest==%s\n", cmd, rest));
+ PRINT_DEBUG (("cmd==%s rest==%s\n", cmd, rest?rest:"NULL"));
/* Look for it in the aliases, first. */
for (i=0; i<alias_list_last; i++)
diff --git a/src/bar.c b/src/bar.c
index c54c627..a44ef5c 100644
--- a/src/bar.c
+++ b/src/bar.c
@@ -495,7 +495,7 @@ marked_message (char *msg, int mark_start, int mark_end)
int width;
int height;
- PRINT_DEBUG (("msg = %s\n", msg));
+ PRINT_DEBUG (("msg = %s\n", msg?msg:"NULL"));
PRINT_DEBUG (("mark_start = %d, mark_end = %d\n", mark_start, mark_end));
/* Schedule the bar to be hidden after some amount of time. */