SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8800 from keszybz/trivialities

Browse Source 
Trivial cleanups
This commit is contained in:
Lennart Poettering
2018-04-24 17:30:07 +02:00
committed by GitHub
parent 9ea41a9bda 7ccf760381
commit 9dfcc1df07
4 changed files with 53 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/manager.c
+3 -5
View File
@@ -1255,7 +1255,7 @@ Manager* manager_free(Manager *m) {
return mfree(m);
}
void manager_enumerate(Manager *m) {
static void manager_enumerate(Manager *m) {
UnitType c;
assert(m);
@@ -1268,10 +1268,8 @@ void manager_enumerate(Manager *m) {
continue;
}
if (!unit_vtable[c]->enumerate)
continue;
unit_vtable[c]->enumerate(m);
if (unit_vtable[c]->enumerate)
unit_vtable[c]->enumerate(m);
}
manager_dispatch_load_queue(m);
src/core/manager.h
-1
View File
@@ -373,7 +373,6 @@ int manager_new(UnitFileScope scope, unsigned test_run_flags, Manager **m);
Manager* manager_free(Manager *m);
DEFINE_TRIVIAL_CLEANUP_FUNC(Manager*, manager_free);
void manager_enumerate(Manager *m);
int manager_startup(Manager *m, FILE *serialization, FDSet *fds);
Job *manager_get_job(Manager *m, uint32_t id);
src/hwdb/hwdb.c
+7 -8
View File
@@ -694,15 +694,14 @@ static int hwdb_update(int argc, char *argv[], void *userdata) {
static void help(void) {
printf("Usage: %s OPTIONS COMMAND\n\n"
"Update or query the hardware database.\n\n"
" -h --help Show this help\n"
" --version Show package version\n"
" -s --strict When updating, return non-zero exit value on any parsing\n"
" error\n"
" --usr Generate in " UDEVLIBEXECDIR " instead of /etc/udev\n"
" -r --root=PATH Alternative root path in the filesystem\n\n"
" -h --help Show this help\n"
" --version Show package version\n"
" -s --strict When updating, return non-zero exit value on any parsing error\n"
" --usr Generate in " UDEVLIBEXECDIR " instead of /etc/udev\n"
" -r --root=PATH Alternative root path in the filesystem\n\n"
"Commands:\n"
" update Update the hwdb database\n"
" query MODALIAS Query database and print result\n",
" update Update the hwdb database\n"
" query MODALIAS Query database and print result\n",
program_invocation_short_name);
}