mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
xen/decompress: resolve MISRA R5.5 identifier/macro name conflicts
Convert 'free' macro in 'decompress.h' from object-like to function-like
form.
The object-like macro '#define free xfree' performs unconditional text
replacement, causing conflicts with identifiers named 'free', such as
struct fields in 'page_info' unions defined in 'xen/arch/arm/include/asm/mm.h'.
Function-like macros only match when followed by parentheses, allowing
'free' to be used both as a macro and as a struct field without conflicts.
Applying function-like form to 'malloc', 'large_malloc' and 'large_free'
ensures consistent macro style.
Additionally moved 'large_{malloc,free}' past the #endif to reduce
redundancy.
While function-like macros prevent uses where the underlying function
identifier is needed directly, such as taking a function pointer, no
such uses exist in the current Xen codebase.
Signed-off-by: Dmytro Prokopchuk <dmytro_prokopchuk1@epam.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
Release-Acked-by: Oleksii Kurochko <oleksii.kurochko@gmail.com>
This commit is contained in:
1 parent
ffe7a07597
commit
4c0c961674
1 file changed
+5
-8
@@ -9,11 +9,8 @@
|
||||
#include <xen/types.h>
|
||||
#include <xen/xmalloc.h>
|
||||
|
||||
#define malloc xmalloc_bytes
|
||||
#define free xfree
|
||||
|
||||
#define large_malloc xmalloc_bytes
|
||||
#define large_free xfree
|
||||
#define malloc(s) xmalloc_bytes(s)
|
||||
#define free(p) xfree(p)
|
||||
|
||||
#else
|
||||
|
||||
@@ -21,9 +18,9 @@
|
||||
#define __init
|
||||
#define __initdata
|
||||
|
||||
#define large_malloc malloc
|
||||
#define large_free free
|
||||
|
||||
#endif
|
||||
|
||||
#define large_malloc(s) malloc(s)
|
||||
#define large_free(p) free(p)
|
||||
|
||||
#endif /* DECOMPRESS_H */
|
||||