diff options
Diffstat (limited to 'src/xrdb.c')
| -rw-r--r-- | src/xrdb.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/xrdb.c b/src/xrdb.c index 0950b706699..9c625e9821e 100644 --- a/src/xrdb.c +++ b/src/xrdb.c @@ -60,12 +60,12 @@ x_get_customization_string (XrmDatabase db, const char *name, { char *full_name = alloca (strlen (name) + sizeof "customization" + 3); char *full_class = alloca (strlen (class) + sizeof "Customization" + 3); - char *result; + const char *result; sprintf (full_name, "%s.%s", name, "customization"); sprintf (full_class, "%s.%s", class, "Customization"); - result = x_get_string_resource (db, full_name, full_class); + result = x_get_string_resource (&db, full_name, full_class); return result ? xstrdup (result) : NULL; } @@ -547,19 +547,20 @@ x_get_resource (XrmDatabase rdb, const char *name, const char *class, /* Retrieve the string resource specified by NAME with CLASS from database RDB. */ -char * -x_get_string_resource (XrmDatabase rdb, const char *name, const char *class) +const char * +x_get_string_resource (void *v_rdb, const char *name, const char *class) { + XrmDatabase *rdb = v_rdb; XrmValue value; if (inhibit_x_resources) /* --quick was passed, so this is a no-op. */ return NULL; - if (x_get_resource (rdb, name, class, x_rm_string, &value)) - return (char *) value.addr; + if (x_get_resource (*rdb, name, class, x_rm_string, &value)) + return (const char *) value.addr; - return 0; + return NULL; } /* Stand-alone test facilities. */ @@ -648,7 +649,7 @@ main (int argc, char **argv) printf ("Class: "); gets (query_class); - value = x_get_string_resource (xdb, query_name, query_class); + value = x_get_string_resource (&xdb, query_name, query_class); if (value != NULL) printf ("\t%s(%s): %s\n\n", query_name, query_class, value); |