diff options
| author | Lennart Poettering <lennart@poettering.net> | 2021-05-05 16:06:56 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2021-05-07 16:44:03 +0200 |
| commit | 2d882d3581f14c0010d0a9996f53746936aded7c (patch) | |
| tree | 1c6086d912a8d9294641da75861964a774e1f5d8 /src/nss-systemd | |
| parent | bbfb8c878c4909fa3de6c735ab84dd6e6158e61f (diff) | |
| download | systemd-2d882d3581f14c0010d0a9996f53746936aded7c.tar.gz | |
nss-systemd: make llvm work-around for used _cleanup_ explicit
Diffstat (limited to 'src/nss-systemd')
| -rw-r--r-- | src/nss-systemd/nss-systemd.c | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/src/nss-systemd/nss-systemd.c b/src/nss-systemd/nss-systemd.c index 3ac57441d9..5592eaa3aa 100644 --- a/src/nss-systemd/nss-systemd.c +++ b/src/nss-systemd/nss-systemd.c @@ -294,8 +294,8 @@ static enum nss_status nss_systemd_endent(GetentData *p) { assert(p); - _cleanup_(pthread_mutex_unlock_assertp) pthread_mutex_t *_l = NULL; - _l = pthread_mutex_lock_assert(&p->mutex); + _cleanup_(pthread_mutex_unlock_assertp) pthread_mutex_t *_l = pthread_mutex_lock_assert(&p->mutex); + (void) _l; /* make llvm shut up about _l not being used. */ p->iterator = userdb_iterator_free(p->iterator); p->by_membership = false; @@ -312,16 +312,16 @@ enum nss_status _nss_systemd_endgrent(void) { } enum nss_status _nss_systemd_setpwent(int stayopen) { + int r; + PROTECT_ERRNO; NSS_ENTRYPOINT_BEGIN; if (_nss_systemd_is_blocked()) return NSS_STATUS_NOTFOUND; - _cleanup_(pthread_mutex_unlock_assertp) pthread_mutex_t *_l = NULL; - int r; - - _l = pthread_mutex_lock_assert(&getpwent_data.mutex); + _cleanup_(pthread_mutex_unlock_assertp) pthread_mutex_t *_l = pthread_mutex_lock_assert(&getpwent_data.mutex); + (void) _l; /* make llvm shut up about _l not being used. */ getpwent_data.iterator = userdb_iterator_free(getpwent_data.iterator); getpwent_data.by_membership = false; @@ -336,16 +336,16 @@ enum nss_status _nss_systemd_setpwent(int stayopen) { } enum nss_status _nss_systemd_setgrent(int stayopen) { + int r; + PROTECT_ERRNO; NSS_ENTRYPOINT_BEGIN; if (_nss_systemd_is_blocked()) return NSS_STATUS_NOTFOUND; - _cleanup_(pthread_mutex_unlock_assertp) pthread_mutex_t *_l = NULL; - int r; - - _l = pthread_mutex_lock_assert(&getgrent_data.mutex); + _cleanup_(pthread_mutex_unlock_assertp) pthread_mutex_t *_l = pthread_mutex_lock_assert(&getgrent_data.mutex); + (void) _l; /* make llvm shut up about _l not being used. */ getgrent_data.iterator = userdb_iterator_free(getgrent_data.iterator); getgrent_data.by_membership = false; @@ -372,9 +372,8 @@ enum nss_status _nss_systemd_getpwent_r( if (_nss_systemd_is_blocked()) return NSS_STATUS_NOTFOUND; - _cleanup_(pthread_mutex_unlock_assertp) pthread_mutex_t *_l = NULL; - - _l = pthread_mutex_lock_assert(&getpwent_data.mutex); + _cleanup_(pthread_mutex_unlock_assertp) pthread_mutex_t *_l = pthread_mutex_lock_assert(&getpwent_data.mutex); + (void) _l; /* make llvm shut up about _l not being used. */ if (!getpwent_data.iterator) { UNPROTECT_ERRNO; @@ -419,9 +418,8 @@ enum nss_status _nss_systemd_getgrent_r( if (_nss_systemd_is_blocked()) return NSS_STATUS_NOTFOUND; - _cleanup_(pthread_mutex_unlock_assertp) pthread_mutex_t *_l = NULL; - - _l = pthread_mutex_lock_assert(&getgrent_data.mutex); + _cleanup_(pthread_mutex_unlock_assertp) pthread_mutex_t *_l = pthread_mutex_lock_assert(&getgrent_data.mutex); + (void) _l; /* make llvm shut up about _l not being used. */ if (!getgrent_data.iterator) { UNPROTECT_ERRNO; |