chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
man: document sd_journal_get_cursor()
[elogind.git]
/
src
/
core
/
service.c
diff --git
a/src/core/service.c
b/src/core/service.c
index e57b0e970c7794d55b59b2af07b01fd9c37bfeda..2be6ee5d99a992459cfdc0478d5add4c73928fb7 100644
(file)
--- a/
src/core/service.c
+++ b/
src/core/service.c
@@
-722,7
+722,7
@@
static int service_load_sysv_path(Service *s, const char *path) {
char *d = NULL;
if (chkconfig_description)
char *d = NULL;
if (chkconfig_description)
- d = join(chkconfig_description, " ", j, NULL);
+ d =
str
join(chkconfig_description, " ", j, NULL);
else
d = strdup(j);
else
d = strdup(j);
@@
-879,7
+879,7
@@
static int service_load_sysv_path(Service *s, const char *path) {
char *d = NULL;
if (long_description)
char *d = NULL;
if (long_description)
- d = join(long_description, " ", t, NULL);
+ d =
str
join(long_description, " ", t, NULL);
else
d = strdup(j);
else
d = strdup(j);
@@
-1001,7
+1001,7
@@
static int service_load_sysv_name(Service *s, const char *name) {
char *path;
int r;
char *path;
int r;
- path = join(*p, "/", name, NULL);
+ path =
str
join(*p, "/", name, NULL);
if (!path)
return -ENOMEM;
if (!path)
return -ENOMEM;
@@
-1023,7
+1023,7
@@
static int service_load_sysv_name(Service *s, const char *name) {
if (r >= 0 && UNIT(s)->load_state == UNIT_STUB) {
/* Try SUSE style boot.* init scripts */
if (r >= 0 && UNIT(s)->load_state == UNIT_STUB) {
/* Try SUSE style boot.* init scripts */
- path = join(*p, "/boot.", name, NULL);
+ path =
str
join(*p, "/boot.", name, NULL);
if (!path)
return -ENOMEM;
if (!path)
return -ENOMEM;
@@
-1038,7
+1038,7
@@
static int service_load_sysv_name(Service *s, const char *name) {
if (r >= 0 && UNIT(s)->load_state == UNIT_STUB) {
/* Try Frugalware style rc.* init scripts */
if (r >= 0 && UNIT(s)->load_state == UNIT_STUB) {
/* Try Frugalware style rc.* init scripts */
- path = join(*p, "/rc.", name, NULL);
+ path =
str
join(*p, "/rc.", name, NULL);
if (!path)
return -ENOMEM;
if (!path)
return -ENOMEM;
@@
-3407,7
+3407,7
@@
static int service_enumerate(Manager *m) {
struct dirent *de;
free(path);
struct dirent *de;
free(path);
- path = join(*p, "/", rcnd_table[i].path, NULL);
+ path =
str
join(*p, "/", rcnd_table[i].path, NULL);
if (!path) {
r = -ENOMEM;
goto finish;
if (!path) {
r = -ENOMEM;
goto finish;
@@
-3442,7
+3442,7
@@
static int service_enumerate(Manager *m) {
continue;
free(fpath);
continue;
free(fpath);
- fpath = join(path, "/", de->d_name, NULL);
+ fpath =
str
join(path, "/", de->d_name, NULL);
if (!fpath) {
r = -ENOMEM;
goto finish;
if (!fpath) {
r = -ENOMEM;
goto finish;