mirror of
https://github.com/systemd/systemd.git
synced 2024-11-01 17:51:22 +03:00
Merge pull request #10537 from poettering/sentinelimania
add some missing _sentinel_ decorators
This commit is contained in:
commit
9c3c438514
@ -1,6 +1,8 @@
|
||||
/* SPDX-License-Identifier: LGPL-2.1+ */
|
||||
#pragma once
|
||||
|
||||
#include "macro.h"
|
||||
|
||||
enum {
|
||||
CONF_FILES_EXECUTABLE = 1 << 0,
|
||||
CONF_FILES_REGULAR = 1 << 1,
|
||||
@ -9,7 +11,7 @@ enum {
|
||||
CONF_FILES_FILTER_MASKED = 1 << 4,
|
||||
};
|
||||
|
||||
int conf_files_list(char ***ret, const char *suffix, const char *root, unsigned flags, const char *dir, ...);
|
||||
int conf_files_list(char ***ret, const char *suffix, const char *root, unsigned flags, const char *dir, ...) _sentinel_;
|
||||
int conf_files_list_strv(char ***ret, const char *suffix, const char *root, unsigned flags, const char* const* dirs);
|
||||
int conf_files_list_nulstr(char ***ret, const char *suffix, const char *root, unsigned flags, const char *dirs);
|
||||
int conf_files_insert(char ***strv, const char *root, char **dirs, const char *path);
|
||||
|
@ -8,5 +8,5 @@ int path_is_os_tree(const char *path);
|
||||
int open_os_release(const char *root, char **ret_path, int *ret_fd);
|
||||
int fopen_os_release(const char *root, char **ret_path, FILE **ret_file);
|
||||
|
||||
int parse_os_release(const char *root, ...);
|
||||
int parse_os_release(const char *root, ...) _sentinel_;
|
||||
int load_os_release_pairs(const char *root, char ***ret);
|
||||
|
@ -159,7 +159,7 @@ static inline int safe_fork(const char *name, ForkFlags flags, pid_t *ret_pid) {
|
||||
return safe_fork_full(name, NULL, 0, flags, ret_pid);
|
||||
}
|
||||
|
||||
int fork_agent(const char *name, const int except[], size_t n_except, pid_t *pid, const char *path, ...);
|
||||
int fork_agent(const char *name, const int except[], size_t n_except, pid_t *pid, const char *path, ...) _sentinel_;
|
||||
|
||||
int set_oom_score_adjust(int value);
|
||||
|
||||
|
@ -4659,8 +4659,7 @@ int exec_command_set(ExecCommand *c, const char *path, ...) {
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
free(c->path);
|
||||
c->path = p;
|
||||
free_and_replace(c->path, p);
|
||||
|
||||
return strv_free_and_replace(c->argv, l);
|
||||
}
|
||||
|
@ -352,8 +352,8 @@ void exec_command_reset_status_array(ExecCommand *c, size_t n);
|
||||
void exec_command_reset_status_list_array(ExecCommand **c, size_t n);
|
||||
void exec_command_dump_list(ExecCommand *c, FILE *f, const char *prefix);
|
||||
void exec_command_append_list(ExecCommand **l, ExecCommand *e);
|
||||
int exec_command_set(ExecCommand *c, const char *path, ...);
|
||||
int exec_command_append(ExecCommand *c, const char *path, ...);
|
||||
int exec_command_set(ExecCommand *c, const char *path, ...) _sentinel_;
|
||||
int exec_command_append(ExecCommand *c, const char *path, ...) _sentinel_;
|
||||
|
||||
void exec_context_init(ExecContext *c);
|
||||
void exec_context_done(ExecContext *c);
|
||||
|
Loading…
Reference in New Issue
Block a user