summaryrefslogtreecommitdiff
path: root/util.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-02-03 14:21:48 +0100
committerLennart Poettering <lennart@poettering.net>2010-02-03 14:21:48 +0100
commit47be870bd83fb3719dffc3ee9348a409ab762a14 (patch)
tree1d1ad244ffb51c901590ba320e8b458cad825021 /util.c
parenta7334b0952ab66c17ee787e36e6d2c5ceb387de6 (diff)
build: basic autoconfization
Diffstat (limited to 'util.c')
-rw-r--r--util.c12
1 files changed, 6 insertions, 6 deletions
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;