X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fbasic%2Futil.c;h=f8ecc929be2f597d7476061b34c6ff419fec1eea;hp=27c3d483931d6ed5c39861b1707931ccff621087;hb=4a7059686430f596810f0c83e4897154828fd352;hpb=f5eb2a086bc5d5d36bc2e4755a1d6b508e202250 diff --git a/src/basic/util.c b/src/basic/util.c index 27c3d4839..f8ecc929b 100644 --- a/src/basic/util.c +++ b/src/basic/util.c @@ -131,7 +131,7 @@ static int do_execute(char **directories, usec_t timeout, char *argv[]) { if (r < 0) return log_oom(); - path = strjoin(*directory, "/", de->d_name, NULL); + path = strjoin(*directory, "/", de->d_name); if (!path) return log_oom(); @@ -498,7 +498,7 @@ void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size, u = nmemb; while (l < u) { idx = (l + u) / 2; - p = (void *)(((const char *) base) + (idx * size)); + p = (const char *) base + idx * size; comparison = compar(key, p, arg); if (comparison < 0) u = idx;