all/systemd: reformat ./{shared,src}/systemd/ with new clang-format style
./contrib/scripts/nm-code-format.sh -i
This commit is contained in:
Thomas Haller
@@ -13,7 +13,7 @@
|
||||
/*****************************************************************************/
|
||||
|
||||
/* strerror() is not thread-safe. Patch systemd-sources via a define. */
|
||||
#define strerror(errsv) nm_strerror_native (errsv)
|
||||
#define strerror(errsv) nm_strerror_native(errsv)
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
@@ -29,49 +29,91 @@
|
||||
/*****************************************************************************/
|
||||
|
||||
static inline int
|
||||
_nm_log_get_max_level_realm (void)
|
||||
_nm_log_get_max_level_realm(void)
|
||||
{
|
||||
/* inline function, to avoid coverity warning about constant expression. */
|
||||
return 7 /* LOG_DEBUG */;
|
||||
/* inline function, to avoid coverity warning about constant expression. */
|
||||
return 7 /* LOG_DEBUG */;
|
||||
}
|
||||
#define log_get_max_level_realm(realm) _nm_log_get_max_level_realm ()
|
||||
#define log_get_max_level_realm(realm) _nm_log_get_max_level_realm()
|
||||
|
||||
#define log_internal_realm(level, error, file, line, func, format, ...) \
|
||||
({ \
|
||||
const int _nm_e = (error); \
|
||||
const NMLogLevel _nm_l = nm_log_level_from_syslog (LOG_PRI (level)); \
|
||||
\
|
||||
if (_nm_log_enabled_impl (!(NM_THREAD_SAFE_ON_MAIN_THREAD), _nm_l, LOGD_SYSTEMD)) { \
|
||||
const char *_nm_location = strrchr ((""file), '/'); \
|
||||
\
|
||||
_nm_log_impl (_nm_location ? _nm_location + 1 : (""file), (line), (func), !(NM_THREAD_SAFE_ON_MAIN_THREAD), _nm_l, LOGD_SYSTEMD, _nm_e, NULL, NULL, ("%s"format), "libsystemd: ", ## __VA_ARGS__); \
|
||||
} \
|
||||
(_nm_e > 0 ? -_nm_e : _nm_e); \
|
||||
})
|
||||
#define log_internal_realm(level, error, file, line, func, format, ...) \
|
||||
({ \
|
||||
const int _nm_e = (error); \
|
||||
const NMLogLevel _nm_l = nm_log_level_from_syslog(LOG_PRI(level)); \
|
||||
\
|
||||
if (_nm_log_enabled_impl(!(NM_THREAD_SAFE_ON_MAIN_THREAD), _nm_l, LOGD_SYSTEMD)) { \
|
||||
const char *_nm_location = strrchr(("" file), '/'); \
|
||||
\
|
||||
_nm_log_impl(_nm_location ? _nm_location + 1 : ("" file), \
|
||||
(line), \
|
||||
(func), \
|
||||
!(NM_THREAD_SAFE_ON_MAIN_THREAD), \
|
||||
_nm_l, \
|
||||
LOGD_SYSTEMD, \
|
||||
_nm_e, \
|
||||
NULL, \
|
||||
NULL, \
|
||||
("%s" format), \
|
||||
"libsystemd: ", \
|
||||
##__VA_ARGS__); \
|
||||
} \
|
||||
(_nm_e > 0 ? -_nm_e : _nm_e); \
|
||||
})
|
||||
|
||||
#define log_assert_failed(text, file, line, func) \
|
||||
G_STMT_START { \
|
||||
log_internal (LOG_CRIT, 0, file, line, func, "Assertion '%s' failed at %s:%u, function %s(). Aborting.", text, file, line, func); \
|
||||
g_assert_not_reached (); \
|
||||
} G_STMT_END
|
||||
#define log_assert_failed(text, file, line, func) \
|
||||
G_STMT_START \
|
||||
{ \
|
||||
log_internal(LOG_CRIT, \
|
||||
0, \
|
||||
file, \
|
||||
line, \
|
||||
func, \
|
||||
"Assertion '%s' failed at %s:%u, function %s(). Aborting.", \
|
||||
text, \
|
||||
file, \
|
||||
line, \
|
||||
func); \
|
||||
g_assert_not_reached(); \
|
||||
} \
|
||||
G_STMT_END
|
||||
|
||||
#define log_assert_failed_unreachable(text, file, line, func) \
|
||||
G_STMT_START { \
|
||||
log_internal (LOG_CRIT, 0, file, line, func, "Code should not be reached '%s' at %s:%u, function %s(). Aborting.", text, file, line, func); \
|
||||
g_assert_not_reached (); \
|
||||
} G_STMT_END
|
||||
#define log_assert_failed_unreachable(text, file, line, func) \
|
||||
G_STMT_START \
|
||||
{ \
|
||||
log_internal(LOG_CRIT, \
|
||||
0, \
|
||||
file, \
|
||||
line, \
|
||||
func, \
|
||||
"Code should not be reached '%s' at %s:%u, function %s(). Aborting.", \
|
||||
text, \
|
||||
file, \
|
||||
line, \
|
||||
func); \
|
||||
g_assert_not_reached(); \
|
||||
} \
|
||||
G_STMT_END
|
||||
|
||||
#define log_assert_failed_return(text, file, line, func) \
|
||||
({ \
|
||||
log_internal (LOG_DEBUG, 0, file, line, func, "Assertion '%s' failed at %s:%u, function %s(). Ignoring.", text, file, line, func); \
|
||||
g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, text); \
|
||||
(void) 0; \
|
||||
})
|
||||
#define log_assert_failed_return(text, file, line, func) \
|
||||
({ \
|
||||
log_internal(LOG_DEBUG, \
|
||||
0, \
|
||||
file, \
|
||||
line, \
|
||||
func, \
|
||||
"Assertion '%s' failed at %s:%u, function %s(). Ignoring.", \
|
||||
text, \
|
||||
file, \
|
||||
line, \
|
||||
func); \
|
||||
g_return_if_fail_warning(G_LOG_DOMAIN, G_STRFUNC, text); \
|
||||
(void) 0; \
|
||||
})
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
#ifndef VALGRIND
|
||||
#define VALGRIND 0
|
||||
#define VALGRIND 0
|
||||
#endif
|
||||
|
||||
#define ENABLE_DEBUG_HASHMAP 0
|
||||
@@ -83,68 +125,71 @@ G_STMT_START { \
|
||||
|
||||
#if (NETWORKMANAGER_COMPILATION) & NM_NETWORKMANAGER_COMPILATION_WITH_SYSTEMD
|
||||
|
||||
#include <sys/syscall.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/syscall.h>
|
||||
#include <sys/ioctl.h>
|
||||
|
||||
#define ENABLE_GSHADOW FALSE
|
||||
#define ENABLE_GSHADOW FALSE
|
||||
|
||||
#define HAVE_SECCOMP 0
|
||||
#define HAVE_SECCOMP 0
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
/* systemd cannot be compiled with "-Wdeclaration-after-statement". In particular
|
||||
* in combination with assert_cc(). */
|
||||
NM_PRAGMA_WARNING_DISABLE ("-Wdeclaration-after-statement")
|
||||
NM_PRAGMA_WARNING_DISABLE("-Wdeclaration-after-statement")
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
static inline pid_t
|
||||
raw_getpid (void) {
|
||||
#if defined(__alpha__)
|
||||
return (pid_t) syscall (__NR_getxpid);
|
||||
#else
|
||||
return (pid_t) syscall (__NR_getpid);
|
||||
#endif
|
||||
raw_getpid(void)
|
||||
{
|
||||
#if defined(__alpha__)
|
||||
return (pid_t) syscall(__NR_getxpid);
|
||||
#else
|
||||
return (pid_t) syscall(__NR_getpid);
|
||||
#endif
|
||||
}
|
||||
|
||||
static inline pid_t _nm_gettid(void) {
|
||||
return (pid_t) syscall(SYS_gettid);
|
||||
static inline pid_t
|
||||
_nm_gettid(void)
|
||||
{
|
||||
return (pid_t) syscall(SYS_gettid);
|
||||
}
|
||||
#define gettid() _nm_gettid ()
|
||||
#define gettid() _nm_gettid()
|
||||
|
||||
/* we build with C11 and thus <uchar.h> provides char32_t,char16_t. */
|
||||
#define HAVE_CHAR32_T 1
|
||||
#define HAVE_CHAR16_T 1
|
||||
/* we build with C11 and thus <uchar.h> provides char32_t,char16_t. */
|
||||
#define HAVE_CHAR32_T 1
|
||||
#define HAVE_CHAR16_T 1
|
||||
|
||||
#if defined(HAVE_DECL_REALLOCARRAY) && HAVE_DECL_REALLOCARRAY == 1
|
||||
#define HAVE_REALLOCARRAY 1
|
||||
#else
|
||||
#define HAVE_REALLOCARRAY 0
|
||||
#endif
|
||||
#if defined(HAVE_DECL_REALLOCARRAY) && HAVE_DECL_REALLOCARRAY == 1
|
||||
#define HAVE_REALLOCARRAY 1
|
||||
#else
|
||||
#define HAVE_REALLOCARRAY 0
|
||||
#endif
|
||||
|
||||
#if defined(HAVE_DECL_EXPLICIT_BZERO) && HAVE_DECL_EXPLICIT_BZERO == 1
|
||||
#define HAVE_EXPLICIT_BZERO 1
|
||||
#else
|
||||
#define HAVE_EXPLICIT_BZERO 0
|
||||
#endif
|
||||
#if defined(HAVE_DECL_EXPLICIT_BZERO) && HAVE_DECL_EXPLICIT_BZERO == 1
|
||||
#define HAVE_EXPLICIT_BZERO 1
|
||||
#else
|
||||
#define HAVE_EXPLICIT_BZERO 0
|
||||
#endif
|
||||
|
||||
#if defined(HAVE_DECL_PIDFD_OPEN) && HAVE_DECL_PIDFD_OPEN == 1
|
||||
#define HAVE_PIDFD_OPEN 1
|
||||
#else
|
||||
#define HAVE_PIDFD_OPEN 0
|
||||
#endif
|
||||
#if defined(HAVE_DECL_PIDFD_OPEN) && HAVE_DECL_PIDFD_OPEN == 1
|
||||
#define HAVE_PIDFD_OPEN 1
|
||||
#else
|
||||
#define HAVE_PIDFD_OPEN 0
|
||||
#endif
|
||||
|
||||
#if defined(HAVE_DECL_PIDFD_SEND_SIGNAL) && HAVE_DECL_PIDFD_SEND_SIGNAL == 1
|
||||
#define HAVE_PIDFD_SEND_SIGNAL 1
|
||||
#else
|
||||
#define HAVE_PIDFD_SEND_SIGNAL 0
|
||||
#endif
|
||||
#if defined(HAVE_DECL_PIDFD_SEND_SIGNAL) && HAVE_DECL_PIDFD_SEND_SIGNAL == 1
|
||||
#define HAVE_PIDFD_SEND_SIGNAL 1
|
||||
#else
|
||||
#define HAVE_PIDFD_SEND_SIGNAL 0
|
||||
#endif
|
||||
|
||||
#if defined(HAVE_DECL_RT_SIGQUEUEINFO) && HAVE_DECL_RT_SIGQUEUEINFO == 1
|
||||
#define HAVE_RT_SIGQUEUEINFO 1
|
||||
#else
|
||||
#define HAVE_RT_SIGQUEUEINFO 0
|
||||
#endif
|
||||
#if defined(HAVE_DECL_RT_SIGQUEUEINFO) && HAVE_DECL_RT_SIGQUEUEINFO == 1
|
||||
#define HAVE_RT_SIGQUEUEINFO 1
|
||||
#else
|
||||
#define HAVE_RT_SIGQUEUEINFO 0
|
||||
#endif
|
||||
|
||||
#endif /* (NETWORKMANAGER_COMPILATION) & NM_NETWORKMANAGER_COMPILATION_WITH_SYSTEMD */
|
||||
|
||||
|
||||
Reference in New Issue
Block a user