chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
logind: add new loginctl lock-sessions command
[elogind.git]
/
src
/
delta
/
delta.c
diff --git
a/src/delta/delta.c
b/src/delta/delta.c
index 1a5b08a7d09e8c7283e26f6e26de62aeefcd278b..eef6536b01f0897d9d182bc50d0f0f01b00e6b2c 100644
(file)
--- a/
src/delta/delta.c
+++ b/
src/delta/delta.c
@@
-192,7
+192,7
@@
static int enumerate_dir(Hashmap *top, Hashmap *bottom, const char *path) {
if (!dirent_is_file(de))
continue;
if (!dirent_is_file(de))
continue;
- p = join(path, "/", de->d_name, NULL);
+ p =
str
join(path, "/", de->d_name, NULL);
if (!p) {
r = -ENOMEM;
goto finish;
if (!p) {
r = -ENOMEM;
goto finish;
@@
-231,7
+231,7
@@
finish:
static int process_suffix(const char *prefixes, const char *suffix) {
const char *p;
char *f;
static int process_suffix(const char *prefixes, const char *suffix) {
const char *p;
char *f;
- Hashmap *top, *bottom;
+ Hashmap *top, *bottom
=NULL
;
int r = 0, k;
Iterator i;
int n_found = 0;
int r = 0, k;
Iterator i;
int n_found = 0;
@@
-254,7
+254,7
@@
static int process_suffix(const char *prefixes, const char *suffix) {
NULSTR_FOREACH(p, prefixes) {
char *t;
NULSTR_FOREACH(p, prefixes) {
char *t;
- t = join(p, "/", suffix, NULL);
+ t =
str
join(p, "/", suffix, NULL);
if (!t) {
r = -ENOMEM;
goto finish;
if (!t) {
r = -ENOMEM;
goto finish;
@@
-453,8
+453,8
@@
int main(int argc, char *argv[]) {
"binfmt.d\0"
"systemd/system\0"
"systemd/user\0"
"binfmt.d\0"
"systemd/system\0"
"systemd/user\0"
- "systemd/system
.
preset\0"
- "systemd/user
.
preset\0"
+ "systemd/system
-
preset\0"
+ "systemd/user
-
preset\0"
"udev/rules.d\0"
"modprobe.d\0";
"udev/rules.d\0"
"modprobe.d\0";