system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-10-01 13:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #33352 from YHNdnzj/freeconp-void

Browse source 
Trivial follow-ups for recent PRs
This commit is contained in:
Luca Boccassi 2024-06-15 19:57:13 +01:00 committed by GitHub
parent b5c8cc0a3b 2128085d0c
commit 2a00e92598
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/basic/missing_loop.h
View file

@ -26,10 +26,14 @@ assert_cc(LO_FLAGS_DIRECT_IO == 16);
assert_cc(LOOP_SET_DIRECT_IO == 0x4C08); assert_cc(LOOP_SET_DIRECT_IO == 0x4C08);
#endif #endif
#ifndef LOOP_SET_STATUS_SETTABLE_FLAGS
# define LOOP_SET_STATUS_SETTABLE_FLAGS (LO_FLAGS_AUTOCLEAR | LO_FLAGS_PARTSCAN)
#endif
#ifndef LOOP_SET_BLOCK_SIZE #ifndef LOOP_SET_BLOCK_SIZE
# define LOOP_SET_BLOCK_SIZE 0x4C09 # define LOOP_SET_BLOCK_SIZE 0x4C09
#else
assert_cc(LOOP_SET_BLOCK_SIZE == 0x4C09);
#endif
#ifndef LOOP_SET_STATUS_SETTABLE_FLAGS
# define LOOP_SET_STATUS_SETTABLE_FLAGS (LO_FLAGS_AUTOCLEAR | LO_FLAGS_PARTSCAN)
#else
assert_cc(LOOP_SET_STATUS_SETTABLE_FLAGS == (LO_FLAGS_AUTOCLEAR | LO_FLAGS_PARTSCAN));
#endif #endif

4
src/fundamental/macro-fundamental.h
View file

@ -517,9 +517,9 @@ static inline uint64_t ALIGN_OFFSET_U64(uint64_t l, uint64_t ali) {
} \ } \
} }
/* Restriction/bug (see above) was fixed in GCC 15 and clang 19.*/ /* Restriction/bug (see below) was fixed in GCC 15 and clang 19. */
#if __GNUC__ >= 15 || (defined(__clang__) && __clang_major__ >= 19) #if __GNUC__ >= 15 || (defined(__clang__) && __clang_major__ >= 19)
#define DECLARE_FLEX_ARRAY(type, name) type name[]; #define DECLARE_FLEX_ARRAY(type, name) type name[]
#else #else
/* Declare a flexible array usable in a union. /* Declare a flexible array usable in a union.
* This is essentially a work-around for a pointless constraint in C99 * This is essentially a work-around for a pointless constraint in C99

3
src/shared/selinux-util.h
View file

@ -14,9 +14,8 @@
DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(char*, freecon, NULL); DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(char*, freecon, NULL);
#else #else
static inline char* freeconp(char **p) { static inline void freeconp(char **p) {
assert(*p == NULL); assert(*p == NULL);
return NULL;
} }
#endif #endif