fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-08 22:58:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

shared/trivial: minor style fixes in "nm-utils/nm-macros-internal.h"

Browse source
This commit is contained in:
Thomas Haller 2017-03-16 12:09:22 +01:00
parent b278b2cd72
commit c2dc1c6fa3
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
shared/nm-utils/nm-macros-internal.h
View file

@ -766,13 +766,15 @@ nm_cmp_uint32_p_with_data (gconstpointer p_a, gconstpointer p_b, gpointer user_d
/*****************************************************************************/ /*****************************************************************************/
static inline guint static inline guint
nm_encode_version (guint major, guint minor, guint micro) { nm_encode_version (guint major, guint minor, guint micro)
{
/* analog to the preprocessor macro NM_ENCODE_VERSION(). */ /* analog to the preprocessor macro NM_ENCODE_VERSION(). */
return (major << 16) | (minor << 8) | micro; return (major << 16) | (minor << 8) | micro;
} }
static inline void static inline void
nm_decode_version (guint version, guint *major, guint *minor, guint *micro) { nm_decode_version (guint version, guint *major, guint *minor, guint *micro)
{
*major = (version & 0xFFFF0000u) >> 16; *major = (version & 0xFFFF0000u) >> 16;
*minor = (version & 0x0000FF00u) >> 8; *minor = (version & 0x0000FF00u) >> 8;
*micro = (version & 0x000000FFu); *micro = (version & 0x000000FFu);
@ -820,7 +822,8 @@ nm_decode_version (guint version, guint *major, guint *minor, guint *micro) {
: "(null)"); \ : "(null)"); \
}) })
#define nm_sprintf_buf(buf, format, ...) ({ \ #define nm_sprintf_buf(buf, format, ...) \
({ \
char * _buf = (buf); \ char * _buf = (buf); \
int _buf_len; \ int _buf_len; \
\ \
@ -919,7 +922,6 @@ nm_decode_version (guint version, guint *major, guint *minor, guint *micro) {
#define _G_BOOLEAN_EXPR(expr) __NM_G_BOOLEAN_EXPR_IMPL (NM_UNIQ, expr) #define _G_BOOLEAN_EXPR(expr) __NM_G_BOOLEAN_EXPR_IMPL (NM_UNIQ, expr)
#endif #endif
/*****************************************************************************/ /*****************************************************************************/
#endif /* __NM_MACROS_INTERNAL_H__ */ #endif /* __NM_MACROS_INTERNAL_H__ */