summaryrefslogtreecommitdiff
path: root/src/xrdb.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/xrdb.c')
-rw-r--r--src/xrdb.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/xrdb.c b/src/xrdb.c
index 6ef5c3bcb4..60dcdae080 100644
--- a/src/xrdb.c
+++ b/src/xrdb.c
@@ -596,7 +596,7 @@ x_get_string_resource (XrmDatabase rdb, const char *name, const char *class)
if (x_get_resource (rdb, name, class, x_rm_string, &value))
return (char *) value.addr;
- return (char *) 0;
+ return 0;
}
/* Stand-alone test facilities. */
@@ -646,10 +646,7 @@ main (int argc, char **argv)
displayname = "localhost:0.0";
lp = member ("-xrm", arg_list);
- if (! NIL (lp))
- resource_string = car (cdr (lp));
- else
- resource_string = (char *) 0;
+ resource_string = NIL (lp) ? 0 : car (cdr (lp));
lp = member ("-c", arg_list);
if (! NIL (lp))