chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Report about syntax errors with metadata
[elogind.git]
/
src
/
shared
/
install.c
diff --git
a/src/shared/install.c
b/src/shared/install.c
index b82d1891dd3846af67ae6b1879b82400c936ea3f..75d6ca36192b9a1e59f6b3cef7e021af208230b4 100644
(file)
--- a/
src/shared/install.c
+++ b/
src/shared/install.c
@@
-700,7
+700,7
@@
int unit_file_link(
UnitFileChange **changes,
unsigned *n_changes) {
UnitFileChange **changes,
unsigned *n_changes) {
- LookupPaths _cleanup_lookup_paths_free_ paths = {
NULL
};
+ LookupPaths _cleanup_lookup_paths_free_ paths = {};
char **i;
char _cleanup_free_ *config_path = NULL;
int r, q;
char **i;
char _cleanup_free_ *config_path = NULL;
int r, q;
@@
-921,15
+921,15
@@
static int install_info_add_auto(
return install_info_add(c, name_or_path, NULL);
}
return install_info_add(c, name_or_path, NULL);
}
-static int config_parse_also(
- const char *filename,
- unsigned line,
- const char *section,
- const char *lvalue,
- int ltype,
- const char *rvalue,
- void *data,
- void *userdata) {
+static int config_parse_also(
const char *unit,
+
const char *filename,
+
unsigned line,
+
const char *section,
+
const char *lvalue,
+
int ltype,
+
const char *rvalue,
+
void *data,
+
void *userdata) {
char *w;
size_t l;
char *w;
size_t l;
@@
-956,15
+956,15
@@
static int config_parse_also(
return 0;
}
return 0;
}
-static int config_parse_user(
- const char *filename,
- unsigned line,
- const char *section,
- const char *lvalue,
- int ltype,
- const char *rvalue,
- void *data,
- void *userdata) {
+static int config_parse_user(
const char *unit,
+
const char *filename,
+
unsigned line,
+
const char *section,
+
const char *lvalue,
+
int ltype,
+
const char *rvalue,
+
void *data,
+
void *userdata) {
InstallInfo *i = data;
char* printed;
InstallInfo *i = data;
char* printed;
@@
-1016,7
+1016,8
@@
static int unit_file_load(
return -ENOMEM;
}
return -ENOMEM;
}
- r = config_parse(path, f, NULL, config_item_table_lookup, (void*) items, true, info);
+ r = config_parse(NULL, path, f, NULL,
+ config_item_table_lookup, (void*) items, true, info);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-1116,7
+1117,7
@@
static int unit_file_can_install(
const char *name,
bool allow_symlink) {
const char *name,
bool allow_symlink) {
- InstallContext _cleanup_install_context_done_ c = {
NULL
};
+ InstallContext _cleanup_install_context_done_ c = {};
InstallInfo *i;
int r;
InstallInfo *i;
int r;
@@
-1452,8
+1453,8
@@
int unit_file_enable(
UnitFileChange **changes,
unsigned *n_changes) {
UnitFileChange **changes,
unsigned *n_changes) {
- LookupPaths _cleanup_lookup_paths_free_ paths = {
NULL
};
- InstallContext _cleanup_install_context_done_ c = {
NULL
};
+ LookupPaths _cleanup_lookup_paths_free_ paths = {};
+ InstallContext _cleanup_install_context_done_ c = {};
char **i;
char _cleanup_free_ *config_path = NULL;
int r;
char **i;
char _cleanup_free_ *config_path = NULL;
int r;
@@
-1491,8
+1492,8
@@
int unit_file_disable(
UnitFileChange **changes,
unsigned *n_changes) {
UnitFileChange **changes,
unsigned *n_changes) {
- LookupPaths _cleanup_lookup_paths_free_ paths = {
NULL
};
- InstallContext _cleanup_install_context_done_ c = {
NULL
};
+ LookupPaths _cleanup_lookup_paths_free_ paths = {};
+ InstallContext _cleanup_install_context_done_ c = {};
char **i;
char _cleanup_free_ *config_path = NULL;
Set _cleanup_set_free_free_ *remove_symlinks_to = NULL;
char **i;
char _cleanup_free_ *config_path = NULL;
Set _cleanup_set_free_free_ *remove_symlinks_to = NULL;
@@
-1533,8
+1534,8
@@
int unit_file_reenable(
UnitFileChange **changes,
unsigned *n_changes) {
UnitFileChange **changes,
unsigned *n_changes) {
- LookupPaths _cleanup_lookup_paths_free_ paths = {
NULL
};
- InstallContext _cleanup_install_context_done_ c = {
NULL
};
+ LookupPaths _cleanup_lookup_paths_free_ paths = {};
+ InstallContext _cleanup_install_context_done_ c = {};
char **i;
char _cleanup_free_ *config_path = NULL;
Set _cleanup_set_free_free_ *remove_symlinks_to = NULL;
char **i;
char _cleanup_free_ *config_path = NULL;
Set _cleanup_set_free_free_ *remove_symlinks_to = NULL;
@@
-1576,7
+1577,7
@@
UnitFileState unit_file_get_state(
const char *root_dir,
const char *name) {
const char *root_dir,
const char *name) {
- LookupPaths _cleanup_lookup_paths_free_ paths = {
NULL
};
+ LookupPaths _cleanup_lookup_paths_free_ paths = {};
UnitFileState state = _UNIT_FILE_STATE_INVALID;
char **i;
char _cleanup_free_ *path = NULL;
UnitFileState state = _UNIT_FILE_STATE_INVALID;
char **i;
char _cleanup_free_ *path = NULL;
@@
-1637,7
+1638,7
@@
UnitFileState unit_file_get_state(
return state;
r = unit_file_can_install(&paths, root_dir, path, true);
return state;
r = unit_file_can_install(&paths, root_dir, path, true);
- if (r < 0 && errno !=
-
ENOENT)
+ if (r < 0 && errno != ENOENT)
return r;
else if (r > 0)
return UNIT_FILE_DISABLED;
return r;
else if (r > 0)
return UNIT_FILE_DISABLED;
@@
-1658,7
+1659,7
@@
int unit_file_query_preset(UnitFileScope scope, const char *name) {
assert(name);
if (scope == UNIT_FILE_SYSTEM)
assert(name);
if (scope == UNIT_FILE_SYSTEM)
- r = conf_files_list(&files, ".preset",
+ r = conf_files_list(&files, ".preset",
NULL,
"/etc/systemd/system-preset",
"/usr/local/lib/systemd/system-preset",
"/usr/lib/systemd/system-preset",
"/etc/systemd/system-preset",
"/usr/local/lib/systemd/system-preset",
"/usr/lib/systemd/system-preset",
@@
-1667,7
+1668,7
@@
int unit_file_query_preset(UnitFileScope scope, const char *name) {
#endif
NULL);
else if (scope == UNIT_FILE_GLOBAL)
#endif
NULL);
else if (scope == UNIT_FILE_GLOBAL)
- r = conf_files_list(&files, ".preset",
+ r = conf_files_list(&files, ".preset",
NULL,
"/etc/systemd/user-preset",
"/usr/local/lib/systemd/user-preset",
"/usr/lib/systemd/user-preset",
"/etc/systemd/user-preset",
"/usr/local/lib/systemd/user-preset",
"/usr/lib/systemd/user-preset",
@@
-1699,7
+1700,7
@@
int unit_file_query_preset(UnitFileScope scope, const char *name) {
if (!*l)
continue;
if (!*l)
continue;
- if (strchr(COMMENTS, *l))
+ if (strchr(COMMENTS
"\n"
, *l))
continue;
if (first_word(l, "enable")) {
continue;
if (first_word(l, "enable")) {
@@
-1734,8
+1735,8
@@
int unit_file_preset(
UnitFileChange **changes,
unsigned *n_changes) {
UnitFileChange **changes,
unsigned *n_changes) {
- LookupPaths _cleanup_lookup_paths_free_ paths = {
NULL
};
- InstallContext _cleanup_install_context_done_ plus = {
NULL}, minus = {NULL
};
+ LookupPaths _cleanup_lookup_paths_free_ paths = {};
+ InstallContext _cleanup_install_context_done_ plus = {
}, minus = {
};
char **i;
char _cleanup_free_ *config_path = NULL;
Set _cleanup_set_free_free_ *remove_symlinks_to = NULL;
char **i;
char _cleanup_free_ *config_path = NULL;
Set _cleanup_set_free_free_ *remove_symlinks_to = NULL;
@@
-1800,7
+1801,7
@@
int unit_file_get_list(
const char *root_dir,
Hashmap *h) {
const char *root_dir,
Hashmap *h) {
- LookupPaths _cleanup_lookup_paths_free_ paths = {
NULL
};
+ LookupPaths _cleanup_lookup_paths_free_ paths = {};
char **i;
char _cleanup_free_ *buf = NULL;
DIR _cleanup_closedir_ *d = NULL;
char **i;
char _cleanup_free_ *buf = NULL;
DIR _cleanup_closedir_ *d = NULL;