shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-13 17:18:18 +03:00
Code

Merge pull request #13784 from keszybz/constify-unit-pointers

Browse Source 
Constify unit pointers
This commit is contained in:
Yu Watanabe 2019-10-17 09:41:36 +09:00 committed by GitHub
commit 7f66ff56eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 36 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/core/load-fragment.c
View File

@ -215,7 +215,7 @@ int config_parse_unit_string_printf(
void *userdata) {
_cleanup_free_ char *k = NULL;
Unit *u = userdata;
const Unit *u = userdata;
int r;
assert(filename);
@ -244,7 +244,7 @@ int config_parse_unit_strv_printf(
void *data,
void *userdata) {
Unit *u = userdata;
const Unit *u = userdata;
_cleanup_free_ char *k = NULL;
int r;
@ -275,7 +275,7 @@ int config_parse_unit_path_printf(
void *userdata) {
_cleanup_free_ char *k = NULL;
Unit *u = userdata;
const Unit *u = userdata;
int r;
bool fatal = ltype;
@ -316,7 +316,7 @@ int config_parse_unit_path_strv_printf(
void *userdata) {
char ***x = data;
Unit *u = userdata;
const Unit *u = userdata;
int r;
const char *p;
@ -606,7 +606,7 @@ int config_parse_exec(
void *userdata) {
ExecCommand **e = data;
Unit *u = userdata;
const Unit *u = userdata;
const char *p;
bool semicolon;
int r;
@ -878,7 +878,7 @@ int config_parse_exec_input(
void *userdata) {
ExecContext *c = data;
Unit *u = userdata;
const Unit *u = userdata;
const char *n;
ExecInput ei;
int r;
@ -948,7 +948,7 @@ int config_parse_exec_input_text(
_cleanup_free_ char *unescaped = NULL, *resolved = NULL;
ExecContext *c = data;
Unit *u = userdata;
const Unit *u = userdata;
size_t sz;
void *p;
int r;
@ -1061,7 +1061,7 @@ int config_parse_exec_output(
_cleanup_free_ char *resolved = NULL;
const char *n;
ExecContext *c = data;
Unit *u = userdata;
const Unit *u = userdata;
ExecOutput eo;
int r;
@ -1405,7 +1405,7 @@ int config_parse_exec_selinux_context(
void *userdata) {
ExecContext *c = data;
Unit *u = userdata;
const Unit *u = userdata;
bool ignore;
char *k;
int r;
@ -1454,7 +1454,7 @@ int config_parse_exec_apparmor_profile(
void *userdata) {
ExecContext *c = data;
Unit *u = userdata;
const Unit *u = userdata;
bool ignore;
char *k;
int r;
@ -1503,7 +1503,7 @@ int config_parse_exec_smack_process_label(
void *userdata) {
ExecContext *c = data;
Unit *u = userdata;
const Unit *u = userdata;
bool ignore;
char *k;
int r;
@ -1553,7 +1553,7 @@ int config_parse_timer(
_cleanup_(calendar_spec_freep) CalendarSpec *c = NULL;
_cleanup_free_ char *k = NULL;
Unit *u = userdata;
const Unit *u = userdata;
Timer *t = data;
usec_t usec = 0;
TimerValue *v;
@ -1871,7 +1871,7 @@ int config_parse_bus_name(
void *userdata) {
_cleanup_free_ char *k = NULL;
Unit *u = userdata;
const Unit *u = userdata;
int r;
assert(filename);
@ -2017,7 +2017,7 @@ int config_parse_user_group_compat(
_cleanup_free_ char *k = NULL;
char **user = data;
Unit *u = userdata;
const Unit *u = userdata;
int r;
assert(filename);
@ -2057,7 +2057,7 @@ int config_parse_user_group_strv_compat(
void *userdata) {
char ***users = data;
Unit *u = userdata;
const Unit *u = userdata;
const char *p = rvalue;
int r;
@ -2118,7 +2118,7 @@ int config_parse_working_directory(
void *userdata) {
ExecContext *c = data;
Unit *u = userdata;
const Unit *u = userdata;
bool missing_ok;
int r;
@ -2178,7 +2178,7 @@ int config_parse_unit_env_file(const char *unit,
void *userdata) {
char ***env = data;
Unit *u = userdata;
const Unit *u = userdata;
_cleanup_free_ char *n = NULL;
int r;
@ -2224,7 +2224,7 @@ int config_parse_environ(
void *data,
void *userdata) {
Unit *u = userdata;
const Unit *u = userdata;
char ***env = data;
const char *p;
int r;
@ -2294,7 +2294,7 @@ int config_parse_pass_environ(
size_t nlen = 0, nbufsize = 0;
char*** passenv = data;
const char *p = rvalue;
Unit *u = userdata;
const Unit *u = userdata;
int r;
assert(filename);
@ -2370,7 +2370,7 @@ int config_parse_unset_environ(
size_t nlen = 0, nbufsize = 0;
char*** unsetenv = data;
const char *p = rvalue;
Unit *u = userdata;
const Unit *u = userdata;
int r;
assert(filename);
@ -2443,7 +2443,7 @@ int config_parse_log_extra_fields(
void *userdata) {
ExecContext *c = data;
Unit *u = userdata;
const Unit *u = userdata;
const char *p = rvalue;
int r;
@ -2516,7 +2516,7 @@ int config_parse_unit_condition_path(
Condition **list = data, *c;
ConditionType t = ltype;
bool trigger, negate;
Unit *u = userdata;
const Unit *u = userdata;
int r;
assert(filename);
@ -2572,7 +2572,7 @@ int config_parse_unit_condition_string(
Condition **list = data, *c;
ConditionType t = ltype;
bool trigger, negate;
Unit *u = userdata;
const Unit *u = userdata;
int r;
assert(filename);
@ -2776,7 +2776,7 @@ int config_parse_syscall_filter(
void *userdata) {
ExecContext *c = data;
Unit *u = userdata;
const Unit *u = userdata;
bool invert = false;
const char *p;
int r;
@ -3086,7 +3086,7 @@ int config_parse_unit_slice(
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
_cleanup_free_ char *k = NULL;
Unit *u = userdata, *slice = NULL;
Unit *u = userdata, *slice;
int r;
assert(filename);
@ -3267,7 +3267,7 @@ int config_parse_tasks_max(
void *userdata) {
uint64_t *tasks_max = data, v;
Unit *u = userdata;
const Unit *u = userdata;
int r;
if (isempty(rvalue)) {
@ -3890,7 +3890,7 @@ int config_parse_exec_directories(
void *userdata) {
char***rt = data;
Unit *u = userdata;
const Unit *u = userdata;
const char *p;
int r;
@ -4019,7 +4019,7 @@ int config_parse_namespace_path_strv(
void *data,
void *userdata) {
Unit *u = userdata;
const Unit *u = userdata;
char*** sv = data;
const char *p = rvalue;
int r;
@ -4096,7 +4096,7 @@ int config_parse_temporary_filesystems(
void *data,
void *userdata) {
Unit *u = userdata;
const Unit *u = userdata;
ExecContext *c = data;
const char *p = rvalue;
int r;
@ -4170,7 +4170,7 @@ int config_parse_bind_paths(
void *userdata) {
ExecContext *c = data;
Unit *u = userdata;
const Unit *u = userdata;
const char *p;
int r;
@ -4423,7 +4423,7 @@ int config_parse_pid_file(
void *userdata) {
_cleanup_free_ char *k = NULL, *n = NULL;
Unit *u = userdata;
const Unit *u = userdata;
char **s = data;
int r;
@ -4545,7 +4545,7 @@ int config_parse_ip_filter_bpf_progs(
void *userdata) {
_cleanup_free_ char *resolved = NULL;
Unit *u = userdata;
const Unit *u = userdata;
char ***paths = data;
int r;

5
src/core/unit-printf.c
View File

@ -171,7 +171,7 @@ static int specifier_special_directory(char specifier, const void *data, const v
return 0;
}
int unit_name_printf(Unit *u, const char* format, char **ret) {
int unit_name_printf(const Unit *u, const char* format, char **ret) {
/*
* This will use the passed string as format string and replace the following specifiers (which should all be
@ -215,8 +215,7 @@ int unit_name_printf(Unit *u, const char* format, char **ret) {
return specifier_printf(format, table, u, ret);
}
int unit_full_printf(Unit *u, const char *format, char **ret) {
int unit_full_printf(const Unit *u, const char *format, char **ret) {
/* This is similar to unit_name_printf() but also supports unescaping. Also, adds a couple of additional codes
* (which are likely not suitable for unescaped inclusion in unit names):
*

4
src/core/unit-printf.h
View File

@ -3,5 +3,5 @@
#include "unit.h"
int unit_name_printf(Unit *u, const char* text, char **ret);
int unit_full_printf(Unit *u, const char *text, char **ret);
int unit_name_printf(const Unit *u, const char* text, char **ret);
int unit_full_printf(const Unit *u, const char *text, char **ret);