chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: introduce parse_ip_port (#4825)
[elogind.git]
/
src
/
basic
/
util.c
diff --git
a/src/basic/util.c
b/src/basic/util.c
index f14dba9d9144e31abcd9f4a44446aac1eb060ffb..f8ecc929be2f597d7476061b34c6ff419fec1eea 100644
(file)
--- 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();
if (r < 0)
return log_oom();
- path = strjoin(*directory, "/", de->d_name
, NULL
);
+ path = strjoin(*directory, "/", de->d_name);
if (!path)
return log_oom();
if (!path)
return log_oom();
@@
-471,7
+471,7
@@
bool in_initrd(void) {
* 2. the root file system must be a memory file system
*
* The second check is extra paranoia, since misdetecting an
* 2. the root file system must be a memory file system
*
* The second check is extra paranoia, since misdetecting an
- * initrd can have bad
bad
consequences due the initrd
+ * initrd can have bad consequences due the initrd
* emptying when transititioning to the main systemd.
*/
* emptying when transititioning to the main systemd.
*/
@@
-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;
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;
comparison = compar(key, p, arg);
if (comparison < 0)
u = idx;