summaryrefslogtreecommitdiffstats
path: root/src/xdg-autostart-generator
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2022-02-09 09:55:21 +0100
committerLennart Poettering <lennart@poettering.net>2022-02-09 10:17:23 +0100
commit0b95409928c520e59b345eea14a571820eb8f7b3 (patch)
treeba245e011cd4b32c54cbdfb5e755f5fca95dc82a /src/xdg-autostart-generator
parentconf-parser: refuse section headers with control characters early, just in case (diff)
downloadsystemd-0b95409928c520e59b345eea14a571820eb8f7b3.tar.xz
systemd-0b95409928c520e59b345eea14a571820eb8f7b3.zip
conf-parser: update config_item_*_lookup() to follow modern coding style
Let's rename the return parameters ret_xyz, and always initialize them if we return >= 0, as per our current coding style.
Diffstat (limited to 'src/xdg-autostart-generator')
-rw-r--r--src/xdg-autostart-generator/xdg-autostart-service.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/xdg-autostart-generator/xdg-autostart-service.c b/src/xdg-autostart-generator/xdg-autostart-service.c
index d450341b9f..0e1e84eda8 100644
--- a/src/xdg-autostart-generator/xdg-autostart-service.c
+++ b/src/xdg-autostart-generator/xdg-autostart-service.c
@@ -288,22 +288,22 @@ static int xdg_config_item_table_lookup(
const void *table,
const char *section,
const char *lvalue,
- ConfigParserCallback *func,
- int *ltype,
- void **data,
+ ConfigParserCallback *ret_func,
+ int *ret_ltype,
+ void **ret_data,
void *userdata) {
assert(lvalue);
/* Ignore any keys with [] as those are translations. */
if (strchr(lvalue, '[')) {
- *func = NULL;
- *ltype = 0;
- *data = NULL;
+ *ret_func = NULL;
+ *ret_ltype = 0;
+ *ret_data = NULL;
return 1;
}
- return config_item_table_lookup(table, section, lvalue, func, ltype, data, userdata);
+ return config_item_table_lookup(table, section, lvalue, ret_func, ret_ltype, ret_data, userdata);
}
XdgAutostartService *xdg_autostart_service_parse_desktop(const char *path) {