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

Merge pull request #20738 from mrc0mmand/ci-llvm-13

Browse Source 
ci: build with clang-13
This commit is contained in:
Yu Watanabe 2021-09-16 09:32:21 +09:00 committed by GitHub
commit 73bf0f2ace
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
35 changed files with 54 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build_test.yml vendored
View File

@ -20,9 +20,9 @@ jobs:
env:
- { COMPILER: "gcc", COMPILER_VERSION: "10" }
- { COMPILER: "gcc", COMPILER_VERSION: "11" }
- { COMPILER: "clang", COMPILER_VERSION: "10" }
- { COMPILER: "clang", COMPILER_VERSION: "11" }
- { COMPILER: "clang", COMPILER_VERSION: "12" }
- { COMPILER: "clang", COMPILER_VERSION: "13" }
env: ${{ matrix.env }}
steps:
- name: Repository checkout

2
src/basic/process-util.c
View File

@ -1254,7 +1254,7 @@ int safe_fork_full(
pid_t original_pid, pid;
sigset_t saved_ss, ss;
_cleanup_(restore_sigsetp) sigset_t *saved_ssp = NULL;
_unused_ _cleanup_(restore_sigsetp) sigset_t *saved_ssp = NULL;
bool block_signals = false, block_all = false;
int prio, r;

3
src/basic/unit-file.c
View File

@ -286,7 +286,8 @@ int unit_file_build_name_map(
FOREACH_DIRENT(de, d, log_warning_errno(errno, "Failed to read \"%s\", ignoring: %m", *dir)) {
char *filename;
_cleanup_free_ char *_filename_free = NULL, *simplified = NULL;
_unused_ _cleanup_free_ char *_filename_free = NULL;
_cleanup_free_ char *simplified = NULL;
const char *suffix, *dst = NULL;
bool valid_unit_name;

4
src/core/manager.c
View File

@ -1758,7 +1758,7 @@ int manager_startup(Manager *m, FILE *serialization, FDSet *fds, const char *roo
{
/* This block is (optionally) done with the reloading counter bumped */
_cleanup_(manager_reloading_stopp) Manager *reloading = NULL;
_unused_ _cleanup_(manager_reloading_stopp) Manager *reloading = NULL;
/* If we will deserialize make sure that during enumeration this is already known, so we increase the
* counter here already */
@ -3237,7 +3237,7 @@ int manager_override_watchdog(Manager *m, WatchdogType t, usec_t timeout) {
}
int manager_reload(Manager *m) {
_cleanup_(manager_reloading_stopp) Manager *reloading = NULL;
_unused_ _cleanup_(manager_reloading_stopp) Manager *reloading = NULL;
_cleanup_fdset_free_ FDSet *fds = NULL;
_cleanup_fclose_ FILE *f = NULL;
int r;

2
src/core/namespace.c
View File

@ -853,7 +853,7 @@ static int mount_private_dev(MountEntry *m) {
char temporary_mount[] = "/tmp/namespace-dev-XXXXXX";
const char *d, *dev = NULL, *devpts = NULL, *devshm = NULL, *devhugepages = NULL, *devmqueue = NULL, *devlog = NULL, *devptmx = NULL;
bool can_mknod = true;
_cleanup_umask_ mode_t u;
_unused_ _cleanup_umask_ mode_t u;
int r;
assert(m);

2
src/cryptsetup/cryptsetup.c
View File

@ -1674,7 +1674,7 @@ static int run(int argc, char *argv[]) {
verb = argv[1];
if (streq(verb, "attach")) {
_cleanup_(remove_and_erasep) const char *destroy_key_file = NULL;
_unused_ _cleanup_(remove_and_erasep) const char *destroy_key_file = NULL;
_cleanup_(erase_and_freep) void *key_data = NULL;
const char *volume, *source, *key_file, *options;
crypt_status_info status;

2
src/home/homed.c
View File

@ -14,7 +14,7 @@
static int run(int argc, char *argv[]) {
_cleanup_(manager_freep) Manager *m = NULL;
_cleanup_(notify_on_cleanup) const char *notify_stop = NULL;
_unused_ _cleanup_(notify_on_cleanup) const char *notify_stop = NULL;
int r;
log_setup();

2
src/initctl/initctl.c
View File

@ -311,7 +311,7 @@ static int process_event(Server *s, struct epoll_event *ev) {
static int run(int argc, char *argv[]) {
_cleanup_(server_done) Server server = { .epoll_fd = -1 };
_cleanup_(notify_on_cleanup) const char *notify_stop = NULL;
_unused_ _cleanup_(notify_on_cleanup) const char *notify_stop = NULL;
int r, n;
if (argc > 1)

2
src/journal-remote/journal-remote-main.c
View File

@ -1099,7 +1099,7 @@ static int load_certificates(char **key, char **cert, char **trust) {
static int run(int argc, char **argv) {
_cleanup_(journal_remote_server_destroy) RemoteServer s = {};
_cleanup_(notify_on_cleanup) const char *notify_message = NULL;
_unused_ _cleanup_(notify_on_cleanup) const char *notify_message = NULL;
_cleanup_(erase_and_freep) char *key = NULL;
_cleanup_free_ char *cert = NULL, *trust = NULL;
int r;

2
src/journal-remote/journal-remote.c
View File

@ -272,7 +272,7 @@ int journal_remote_add_source(RemoteServer *s, int fd, char* name, bool own_name
int journal_remote_add_raw_socket(RemoteServer *s, int fd) {
int r;
_cleanup_close_ int fd_ = fd;
_unused_ _cleanup_close_ int fd_ = fd;
char name[STRLEN("raw-socket-") + DECIMAL_STR_MAX(int) + 1];
assert(fd >= 0);

2
src/journal-remote/journal-upload.c
View File

@ -820,7 +820,7 @@ static int open_journal(sd_journal **j) {
static int run(int argc, char **argv) {
_cleanup_(destroy_uploader) Uploader u = {};
_cleanup_(notify_on_cleanup) const char *notify_message = NULL;
_unused_ _cleanup_(notify_on_cleanup) const char *notify_message = NULL;
bool use_journal;
int r;

2
src/journal/journald-server.c
View File

@ -903,7 +903,7 @@ static void dispatch_message_real(
pid_t object_pid) {
char source_time[sizeof("_SOURCE_REALTIME_TIMESTAMP=") + DECIMAL_STR_MAX(usec_t)];
_cleanup_free_ char *cmdline1 = NULL, *cmdline2 = NULL;
_unused_ _cleanup_free_ char *cmdline1 = NULL, *cmdline2 = NULL;
uid_t journal_uid;
ClientContext *o;

9
src/libsystemd/sd-device/sd-device.c
View File

@ -94,7 +94,8 @@ int device_add_property_aux(sd_device *device, const char *key, const char *valu
properties = &device->properties;
if (value) {
_cleanup_free_ char *new_key = NULL, *new_value = NULL, *old_key = NULL, *old_value = NULL;
_unused_ _cleanup_free_ char *old_value = NULL;
_cleanup_free_ char *new_key = NULL, *new_value = NULL, *old_key = NULL;
int r;
r = ordered_hashmap_ensure_allocated(properties, &string_hash_ops_free_free);
@ -119,7 +120,8 @@ int device_add_property_aux(sd_device *device, const char *key, const char *valu
TAKE_PTR(new_key);
TAKE_PTR(new_value);
} else {
_cleanup_free_ char *old_key = NULL, *old_value = NULL;
_unused_ _cleanup_free_ char *old_value = NULL;
_cleanup_free_ char *old_key = NULL;
old_value = ordered_hashmap_remove2(*properties, key, (void**) &old_key);
}
@ -1939,7 +1941,8 @@ _public_ int sd_device_get_trigger_uuid(sd_device *device, sd_id128_t *ret) {
}
static int device_cache_sysattr_value(sd_device *device, const char *key, char *value) {
_cleanup_free_ char *new_key = NULL, *old_value = NULL;
_unused_ _cleanup_free_ char *old_value = NULL;
_cleanup_free_ char *new_key = NULL;
int r;
assert(device);

2
src/libsystemd/sd-journal/test-catalog.c
View File

@ -53,7 +53,7 @@ static void test_catalog_import_invalid(void) {
}
static void test_catalog_import_badid(void) {
_cleanup_ordered_hashmap_free_free_free_ OrderedHashmap *h = NULL;
_unused_ _cleanup_ordered_hashmap_free_free_free_ OrderedHashmap *h = NULL;
const char *input =
"-- 0027229ca0644181a76c4e92458afaff dededededededededededededededede\n" \
"Subject: message\n" \

2
src/login/logind-core.c
View File

@ -703,7 +703,7 @@ bool manager_all_buttons_ignored(Manager *m) {
int manager_read_utmp(Manager *m) {
#if ENABLE_UTMP
int r;
_cleanup_(utxent_cleanup) bool utmpx = false;
_unused_ _cleanup_(utxent_cleanup) bool utmpx = false;
assert(m);

2
src/login/logind-session.c
View File

@ -1323,7 +1323,7 @@ bool session_is_controller(Session *s, const char *sender) {
}
static void session_release_controller(Session *s, bool notify) {
_cleanup_free_ char *name = NULL;
_unused_ _cleanup_free_ char *name = NULL;
SessionDevice *sd;
if (!s->controller)

2
src/login/logind.c
View File

@ -1157,7 +1157,7 @@ static int manager_run(Manager *m) {
static int run(int argc, char *argv[]) {
_cleanup_(manager_unrefp) Manager *m = NULL;
_cleanup_(notify_on_cleanup) const char *notify_message = NULL;
_unused_ _cleanup_(notify_on_cleanup) const char *notify_message = NULL;
int r;
log_set_facility(LOG_AUTH);

6
src/network/networkd-dhcp-common.c
View File

@ -702,8 +702,10 @@ int config_parse_dhcp_send_option(
void *data,
void *userdata) {
_cleanup_(sd_dhcp_option_unrefp) sd_dhcp_option *opt4 = NULL, *old4 = NULL;
_cleanup_(sd_dhcp6_option_unrefp) sd_dhcp6_option *opt6 = NULL, *old6 = NULL;
_cleanup_(sd_dhcp_option_unrefp) sd_dhcp_option *opt4 = NULL;
_cleanup_(sd_dhcp6_option_unrefp) sd_dhcp6_option *opt6 = NULL;
_unused_ _cleanup_(sd_dhcp_option_unrefp) sd_dhcp_option *old4 = NULL;
_unused_ _cleanup_(sd_dhcp6_option_unrefp) sd_dhcp6_option *old6 = NULL;
uint32_t uint32_data, enterprise_identifier = 0;
_cleanup_free_ char *word = NULL, *q = NULL;
OrderedHashmap **options = data;

2
src/network/networkd.c
View File

@ -19,7 +19,7 @@
static int run(int argc, char *argv[]) {
_cleanup_(manager_freep) Manager *m = NULL;
_cleanup_(notify_on_cleanup) const char *notify_message = NULL;
_unused_ _cleanup_(notify_on_cleanup) const char *notify_message = NULL;
int r;
log_setup();

2
src/network/wait-online/wait-online.c
View File

@ -195,7 +195,7 @@ static int parse_argv(int argc, char *argv[]) {
static int run(int argc, char *argv[]) {
_cleanup_(manager_freep) Manager *m = NULL;
_cleanup_(notify_on_cleanup) const char *notify_message = NULL;
_unused_ _cleanup_(notify_on_cleanup) const char *notify_message = NULL;
int r;
log_setup();

6
src/nspawn/nspawn.c
View File

@ -2196,7 +2196,7 @@ static int copy_devnodes(const char *dest) {
"tty\0"
"net/tun\0";
_cleanup_umask_ mode_t u;
_unused_ _cleanup_umask_ mode_t u;
const char *d;
int r = 0;
@ -2279,7 +2279,7 @@ static int copy_devnodes(const char *dest) {
}
static int make_extra_nodes(const char *dest) {
_cleanup_umask_ mode_t u;
_unused_ _cleanup_umask_ mode_t u;
size_t i;
int r;
@ -2480,7 +2480,7 @@ static int setup_kmsg(int kmsg_socket) {
_cleanup_(unlink_and_freep) char *from = NULL;
_cleanup_free_ char *fifo = NULL;
_cleanup_close_ int fd = -1;
_cleanup_umask_ mode_t u;
_unused_ _cleanup_umask_ mode_t u;
int r;
assert(kmsg_socket >= 0);

4
src/nss-systemd/userdb-glue.c
View File

@ -303,7 +303,7 @@ enum nss_status userdb_getgrnam(
}
if (!g) {
_cleanup_(_nss_systemd_unblockp) bool blocked = false;
_unused_ _cleanup_(_nss_systemd_unblockp) bool blocked = false;
if (strv_isempty(members))
return NSS_STATUS_NOTFOUND;
@ -365,7 +365,7 @@ enum nss_status userdb_getgrgid(
}
if (!g) {
_cleanup_(_nss_systemd_unblockp) bool blocked = false;
_unused_ _cleanup_(_nss_systemd_unblockp) bool blocked = false;
/* So, quite possibly we have to extend an existing group record with additional members. But
* to do this we need to know the group name first. The group didn't exist via non-NSS

2
src/oom/oomd-manager.c
View File

@ -387,7 +387,7 @@ static void clear_candidate_hashmapp(Manager **m) {
static int monitor_memory_pressure_contexts_handler(sd_event_source *s, uint64_t usec, void *userdata) {
/* Don't want to use stale candidate data. Setting this will clear the candidate hashmap on return unless we
* update the candidate data (in which case clear_candidates will be NULL). */
_cleanup_(clear_candidate_hashmapp) Manager *clear_candidates = userdata;
_unused_ _cleanup_(clear_candidate_hashmapp) Manager *clear_candidates = userdata;
_cleanup_set_free_ Set *targets = NULL;
bool in_post_action_delay = false;
Manager *m = userdata;

2
src/oom/oomd.c
View File

@ -116,7 +116,7 @@ static int parse_argv(int argc, char *argv[]) {
}
static int run(int argc, char *argv[]) {
_cleanup_(notify_on_cleanup) const char *notify_msg = NULL;
_unused_ _cleanup_(notify_on_cleanup) const char *notify_msg = NULL;
_cleanup_(manager_freep) Manager *m = NULL;
_cleanup_free_ char *swap = NULL;
unsigned long long s = 0;

3
src/partition/repart.c
View File

@ -904,7 +904,8 @@ static void context_place_partitions(Context *context) {
for (size_t i = 0; i < context->n_free_areas; i++) {
FreeArea *a = context->free_areas[i];
uint64_t start, left;
_unused_ uint64_t left;
uint64_t start;
if (a->after) {
assert(a->after->offset != UINT64_MAX);

2
src/resolve/resolved-dns-cache.c
View File

@ -274,7 +274,7 @@ static int dns_cache_link_item(DnsCache *c, DnsCacheItem *i) {
first = hashmap_get(c->by_key, i->key);
if (first) {
_cleanup_(dns_resource_key_unrefp) DnsResourceKey *k = NULL;
_unused_ _cleanup_(dns_resource_key_unrefp) DnsResourceKey *k = NULL;
/* Keep a reference to the original key, while we manipulate the list. */
k = dns_resource_key_ref(first->key);

2
src/resolve/resolved-dns-query.c
View File

@ -165,7 +165,7 @@ static int dns_query_candidate_add_transaction(
}
static int dns_query_candidate_go(DnsQueryCandidate *c) {
_cleanup_(dns_query_candidate_unrefp) DnsQueryCandidate *keep_c = NULL;
_unused_ _cleanup_(dns_query_candidate_unrefp) DnsQueryCandidate *keep_c = NULL;
DnsTransaction *t;
int r;
unsigned n = 0;

2
src/resolve/resolved.c
View File

@ -23,7 +23,7 @@
static int run(int argc, char *argv[]) {
_cleanup_(manager_freep) Manager *m = NULL;
_cleanup_(notify_on_cleanup) const char *notify_stop = NULL;
_unused_ _cleanup_(notify_on_cleanup) const char *notify_stop = NULL;
int r;
log_setup();

2
src/shared/barrier.c
View File

@ -90,7 +90,7 @@
* Returns: 0 on success, negative error code on failure.
*/
int barrier_create(Barrier *b) {
_cleanup_(barrier_destroyp) Barrier *staging = b;
_unused_ _cleanup_(barrier_destroyp) Barrier *staging = b;
int r;
assert(b);

2
src/shared/dev-setup.c
View File

@ -81,7 +81,7 @@ int make_inaccessible_nodes(
{ "inaccessible/blk", S_IFBLK | 0000 },
};
_cleanup_umask_ mode_t u;
_unused_ _cleanup_umask_ mode_t u;
int r;
if (!parent_dir)

8
src/shared/utmp-wtmp.c
View File

@ -25,7 +25,7 @@
#include "utmp-wtmp.h"
int utmp_get_runlevel(int *runlevel, int *previous) {
_cleanup_(utxent_cleanup) bool utmpx = false;
_unused_ _cleanup_(utxent_cleanup) bool utmpx = false;
struct utmpx *found, lookup = { .ut_type = RUN_LVL };
const char *e;
@ -87,7 +87,7 @@ static void init_entry(struct utmpx *store, usec_t t) {
}
static int write_entry_utmp(const struct utmpx *store) {
_cleanup_(utxent_cleanup) bool utmpx = false;
_unused_ _cleanup_(utxent_cleanup) bool utmpx = false;
assert(store);
@ -215,7 +215,7 @@ int utmp_put_init_process(const char *id, pid_t pid, pid_t sid, const char *line
}
int utmp_put_dead_process(const char *id, pid_t pid, int code, int status) {
_cleanup_(utxent_cleanup) bool utmpx = false;
_unused_ _cleanup_(utxent_cleanup) bool utmpx = false;
struct utmpx lookup = {
.ut_type = INIT_PROCESS /* looks for DEAD_PROCESS, LOGIN_PROCESS, USER_PROCESS, too */
}, store, store_wtmp, *found;
@ -340,7 +340,7 @@ int utmp_wall(
bool (*match_tty)(const char *tty, void *userdata),
void *userdata) {
_cleanup_(utxent_cleanup) bool utmpx = false;
_unused_ _cleanup_(utxent_cleanup) bool utmpx = false;
_cleanup_free_ char *text = NULL, *hn = NULL, *un = NULL, *stdin_tty = NULL;
struct utmpx *u;
int r;

2
src/timesync/timesyncd.c
View File

@ -87,7 +87,7 @@ settime:
static int run(int argc, char *argv[]) {
_cleanup_(manager_freep) Manager *m = NULL;
_cleanup_(notify_on_cleanup) const char *notify_message = NULL;
_unused_ _cleanup_(notify_on_cleanup) const char *notify_message = NULL;
const char *user = "systemd-timesync";
uid_t uid, uid_current;
gid_t gid;

3
src/tty-ask-password-agent/tty-ask-password-agent.c
View File

@ -338,7 +338,8 @@ static int process_and_watch_password_files(bool watch) {
_FD_MAX
};
_cleanup_close_ int notify = -1, signal_fd = -1, tty_block_fd = -1;
_unused_ _cleanup_close_ int tty_block_fd = -1;
_cleanup_close_ int notify = -1, signal_fd = -1;
struct pollfd pollfd[_FD_MAX];
sigset_t mask;
int r;

3
src/udev/udevd.c
View File

@ -1136,7 +1136,8 @@ static int on_ctrl_msg(UdevCtrl *uctrl, UdevCtrlMessageType type, const UdevCtrl
manager_reload(manager);
break;
case UDEV_CTRL_SET_ENV: {
_cleanup_free_ char *key = NULL, *val = NULL, *old_key = NULL, *old_val = NULL;
_unused_ _cleanup_free_ char *old_val = NULL;
_cleanup_free_ char *key = NULL, *val = NULL, *old_key = NULL;
const char *eq;
eq = strchr(value->buf, '=');

2
src/userdb/userdbd.c
View File

@ -24,7 +24,7 @@
static int run(int argc, char *argv[]) {
_cleanup_(manager_freep) Manager *m = NULL;
_cleanup_(notify_on_cleanup) const char *notify_stop = NULL;
_unused_ _cleanup_(notify_on_cleanup) const char *notify_stop = NULL;
int r;
log_setup();