shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-10-31 16:21:26 +03:00
Code

udev: make sure UdevBuiltinCommand is properly converted

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2021-02-10 08:32:23 +01:00
parent 38d1e12063
commit 71c163c9fa
3 changed files with 44 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/udev/meson.build
View File

@ -197,6 +197,12 @@ tests += [
[threads, [threads,
libacl]], libacl]],
[['src/udev/test-udev-builtin.c'],
[libudevd_core,
libshared],
[threads,
libacl]],
[['src/udev/fido_id/test-fido-id-desc.c', [['src/udev/fido_id/test-fido-id-desc.c',
'src/udev/fido_id/fido_id_desc.c']], 'src/udev/fido_id/fido_id_desc.c']],
] ]

26
src/udev/test-udev-builtin.c Normal file
View File

@ -0,0 +1,26 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "tests.h"
#include "udev-builtin.h"
static void test_udev_builtin_cmd_to_ptr(void) {
log_info("/* %s */", __func__);
/* Those could have been static_assert()s, but ({}) is not allowed there. */
#if HAVE_BLKID
assert_se(UDEV_BUILTIN_CMD_TO_PTR(UDEV_BUILTIN_BLKID));
assert_se(PTR_TO_UDEV_BUILTIN_CMD(UDEV_BUILTIN_CMD_TO_PTR(UDEV_BUILTIN_BLKID)) == UDEV_BUILTIN_BLKID);
#endif
assert_se(UDEV_BUILTIN_CMD_TO_PTR(UDEV_BUILTIN_BTRFS));
assert_se(PTR_TO_UDEV_BUILTIN_CMD(UDEV_BUILTIN_CMD_TO_PTR(UDEV_BUILTIN_BTRFS)) == UDEV_BUILTIN_BTRFS);
assert_se(PTR_TO_UDEV_BUILTIN_CMD(UDEV_BUILTIN_CMD_TO_PTR(_UDEV_BUILTIN_INVALID)) == _UDEV_BUILTIN_INVALID);
assert_se(PTR_TO_UDEV_BUILTIN_CMD(NULL) == _UDEV_BUILTIN_INVALID);
assert_se(PTR_TO_UDEV_BUILTIN_CMD((void*) 10000) == _UDEV_BUILTIN_INVALID);
}
int main(int argc, char *argv[]) {
test_setup_logging(LOG_DEBUG);
test_udev_builtin_cmd_to_ptr();
}

14
src/udev/udev-builtin.h
View File

@ -37,8 +37,18 @@ typedef struct UdevBuiltin {
bool run_once; bool run_once;
} UdevBuiltin; } UdevBuiltin;
#define PTR_TO_UDEV_BUILTIN_CMD(p) ((UdevBuiltinCommand) ((intptr_t) (p)-1)) #define UDEV_BUILTIN_CMD_TO_PTR(u) \
#define UDEV_BUILTIN_CMD_TO_PTR(u) ((void *) ((intptr_t) (u)+1)) ({ \
UdevBuiltinCommand _u = (u); \
_u < 0 ? NULL : (void*)(intptr_t) (_u + 1); \
})
#define PTR_TO_UDEV_BUILTIN_CMD(p) \
({ \
void *_p = (p); \
_p && (intptr_t)(_p) <= _UDEV_BUILTIN_MAX ? \
(UdevBuiltinCommand)((intptr_t)_p - 1) : _UDEV_BUILTIN_INVALID; \
})
#if HAVE_BLKID #if HAVE_BLKID
extern const UdevBuiltin udev_builtin_blkid; extern const UdevBuiltin udev_builtin_blkid;