From 47be870bd83fb3719dffc3ee9348a409ab762a14 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 3 Feb 2010 14:21:48 +0100 Subject: build: basic autoconfization --- util.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'util.c') diff --git a/util.c b/util.c index 33b143d3bb..bf74695854 100644 --- a/util.c +++ b/util.c @@ -36,10 +36,10 @@ #include "ioprio.h" #include "missing.h" -usec_t now(clockid_t clock) { +usec_t now(clockid_t clock_id) { struct timespec ts; - assert_se(clock_gettime(clock, &ts) == 0); + assert_se(clock_gettime(clock_id, &ts) == 0); return timespec_load(&ts); } @@ -824,11 +824,11 @@ char *xescape(const char *s, const char *bad) { } char *bus_path_escape(const char *s) { - assert(s); - char *r, *t; const char *f; + assert(s); + /* Escapes all chars that D-Bus' object path cannot deal * with. Can be reverse with bus_path_unescape() */ @@ -853,11 +853,11 @@ char *bus_path_escape(const char *s) { } char *bus_path_unescape(const char *s) { - assert(s); - char *r, *t; const char *f; + assert(s); + if (!(r = new(char, strlen(s)+1))) return NULL; -- cgit v1.2.3-54-g00ecf