chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
dd28669
)
manager: don't dispatch load queue if we don't have to
author
Lennart Poettering
<lennart@poettering.net>
Sun, 16 May 2010 02:30:45 +0000
(
04:30
+0200)
committer
Lennart Poettering
<lennart@poettering.net>
Sun, 16 May 2010 02:30:45 +0000
(
04:30
+0200)
manager.c
patch
|
blob
|
history
diff --git
a/manager.c
b/manager.c
index 89b210d6a39515919551275c38e87b668b689016..81af07b000f271f050f6b6c5fb7762d7282e9c09 100644
(file)
--- a/
manager.c
+++ b/
manager.c
@@
-1563,7
+1563,7
@@
int manager_load_unit_prepare(Manager *m, const char *name, const char *path, Un
if ((ret = manager_get_unit(m, name))) {
*_ret = ret;
if ((ret = manager_get_unit(m, name))) {
*_ret = ret;
- return
0
;
+ return
1
;
}
if (!(ret = unit_new(m)))
}
if (!(ret = unit_new(m)))
@@
-1590,7
+1590,6
@@
int manager_load_unit_prepare(Manager *m, const char *name, const char *path, Un
}
int manager_load_unit(Manager *m, const char *name, const char *path, Unit **_ret) {
}
int manager_load_unit(Manager *m, const char *name, const char *path, Unit **_ret) {
- Unit *ret;
int r;
assert(m);
int r;
assert(m);
@@
-1598,13
+1597,13
@@
int manager_load_unit(Manager *m, const char *name, const char *path, Unit **_re
/* This will load the service information files, but not actually
* start any services or anything. */
/* This will load the service information files, but not actually
* start any services or anything. */
- if ((r = manager_load_unit_prepare(m, name, path,
&ret)) <
0)
+ if ((r = manager_load_unit_prepare(m, name, path,
_ret)) !=
0)
return r;
manager_dispatch_load_queue(m);
if (_ret)
return r;
manager_dispatch_load_queue(m);
if (_ret)
- *_ret = unit_follow_merge(ret);
+ *_ret = unit_follow_merge(
*_
ret);
return 0;
}
return 0;
}