diff --git a/shared/systemd/nm-logging-stub.c b/shared/systemd/nm-logging-stub.c index 64a96daaaa..503f5453a1 100644 --- a/shared/systemd/nm-logging-stub.c +++ b/shared/systemd/nm-logging-stub.c @@ -10,31 +10,27 @@ /*****************************************************************************/ gboolean -_nm_log_enabled_impl (gboolean mt_require_locking, - NMLogLevel level, - NMLogDomain domain) +_nm_log_enabled_impl(gboolean mt_require_locking, NMLogLevel level, NMLogDomain domain) { - return FALSE; + return FALSE; } void -_nm_log_impl (const char *file, - guint line, - const char *func, - gboolean mt_require_locking, - NMLogLevel level, - NMLogDomain domain, - int error, - const char *ifname, - const char *con_uuid, - const char *fmt, - ...) -{ -} +_nm_log_impl(const char *file, + guint line, + const char *func, + gboolean mt_require_locking, + NMLogLevel level, + NMLogDomain domain, + int error, + const char *ifname, + const char *con_uuid, + const char *fmt, + ...) +{} void -_nm_utils_monotonic_timestamp_initialized (const struct timespec *tp, - gint64 offset_sec, - gboolean is_boottime) -{ -} +_nm_utils_monotonic_timestamp_initialized(const struct timespec *tp, + gint64 offset_sec, + gboolean is_boottime) +{} diff --git a/shared/systemd/nm-sd-utils-shared.c b/shared/systemd/nm-sd-utils-shared.c index 04b9c8c367..9754008bc7 100644 --- a/shared/systemd/nm-sd-utils-shared.c +++ b/shared/systemd/nm-sd-utils-shared.c @@ -22,32 +22,31 @@ const bool mempool_use_allowed = true; /*****************************************************************************/ gboolean -nm_sd_utils_path_equal (const char *a, const char *b) +nm_sd_utils_path_equal(const char *a, const char *b) { - return path_equal (a, b); + return path_equal(a, b); } char * -nm_sd_utils_path_simplify (char *path, gboolean kill_dots) +nm_sd_utils_path_simplify(char *path, gboolean kill_dots) { - return path_simplify (path, kill_dots); + return path_simplify(path, kill_dots); } const char * -nm_sd_utils_path_startswith (const char *path, const char *prefix) +nm_sd_utils_path_startswith(const char *path, const char *prefix) { - return path_startswith (path, prefix); + return path_startswith(path, prefix); } /*****************************************************************************/ int -nm_sd_utils_unbase64char (char ch, gboolean accept_padding_equal) +nm_sd_utils_unbase64char(char ch, gboolean accept_padding_equal) { - if ( ch == '=' - && accept_padding_equal) - return G_MAXINT; - return unbase64char (ch); + if (ch == '=' && accept_padding_equal) + return G_MAXINT; + return unbase64char(ch); } /** @@ -69,60 +68,54 @@ nm_sd_utils_unbase64char (char ch, gboolean accept_padding_equal) * function fail. */ int -nm_sd_utils_unbase64mem (const char *p, - size_t l, - gboolean secure, - guint8 **mem, - size_t *len) +nm_sd_utils_unbase64mem(const char *p, size_t l, gboolean secure, guint8 **mem, size_t *len) { - return unbase64mem_full (p, l, secure, (void **) mem, len); + return unbase64mem_full(p, l, secure, (void **) mem, len); } -int nm_sd_dns_name_to_wire_format (const char *domain, - guint8 *buffer, - size_t len, - gboolean canonical) +int +nm_sd_dns_name_to_wire_format(const char *domain, guint8 *buffer, size_t len, gboolean canonical) { - return dns_name_to_wire_format (domain, buffer, len, canonical); + return dns_name_to_wire_format(domain, buffer, len, canonical); } -int nm_sd_dns_name_is_valid (const char *s) +int +nm_sd_dns_name_is_valid(const char *s) { - return dns_name_is_valid (s); + return dns_name_is_valid(s); } -gboolean nm_sd_hostname_is_valid (const char *s, bool allow_trailing_dot) +gboolean +nm_sd_hostname_is_valid(const char *s, bool allow_trailing_dot) { - return hostname_is_valid (s, allow_trailing_dot); + return hostname_is_valid(s, allow_trailing_dot); } /*****************************************************************************/ static gboolean -_http_url_is_valid (const char *url, gboolean only_https) +_http_url_is_valid(const char *url, gboolean only_https) { - if ( !url - || !url[0]) - return FALSE; + if (!url || !url[0]) + return FALSE; - if ( !only_https - && NM_STR_HAS_PREFIX (url, "http://")) - url += NM_STRLEN ("http://"); - else if (NM_STR_HAS_PREFIX (url, "https://")) - url += NM_STRLEN ("https://"); - else - return FALSE; + if (!only_https && NM_STR_HAS_PREFIX(url, "http://")) + url += NM_STRLEN("http://"); + else if (NM_STR_HAS_PREFIX(url, "https://")) + url += NM_STRLEN("https://"); + else + return FALSE; - if (!url[0]) - return FALSE; + if (!url[0]) + return FALSE; - return !NM_STRCHAR_ANY (url, ch, (guchar) ch >= 128u); + return !NM_STRCHAR_ANY(url, ch, (guchar) ch >= 128u); } gboolean -nm_sd_http_url_is_valid_https (const char *url) +nm_sd_http_url_is_valid_https(const char *url) { - /* We use this function to verify connection:mud-url property, it must thus + /* We use this function to verify connection:mud-url property, it must thus * not change behavior. * * Note that sd_dhcp_client_set_mud_url() and sd_dhcp6_client_set_request_mud_url() @@ -134,46 +127,46 @@ nm_sd_http_url_is_valid_https (const char *url) * * We only must make sure that this is also correct in the future, when we * re-import systemd code. */ - nm_assert (_http_url_is_valid (url, FALSE) == http_url_is_valid (url)); - return _http_url_is_valid (url, TRUE); + nm_assert(_http_url_is_valid(url, FALSE) == http_url_is_valid(url)); + return _http_url_is_valid(url, TRUE); } /*****************************************************************************/ int -nmtst_systemd_extract_first_word_all (const char *str, char ***out_strv) +nmtst_systemd_extract_first_word_all(const char *str, char ***out_strv) { - gs_unref_ptrarray GPtrArray *arr = NULL; + gs_unref_ptrarray GPtrArray *arr = NULL; - /* we implement a str split function to parse `/proc/cmdline`. This + /* we implement a str split function to parse `/proc/cmdline`. This * code should behave like systemd, which uses extract_first_word() * for that. * * As we want to unit-test our implementation to match systemd, * expose this function for testing. */ - g_assert (out_strv); - g_assert (!*out_strv); + g_assert(out_strv); + g_assert(!*out_strv); - if (!str) - return 0; + if (!str) + return 0; - arr = g_ptr_array_new_with_free_func (g_free); + arr = g_ptr_array_new_with_free_func(g_free); - for (;;) { - gs_free char *word = NULL; - int r; + for (;;) { + gs_free char *word = NULL; + int r; - r = extract_first_word (&str, &word, NULL, EXTRACT_UNQUOTE | EXTRACT_RELAX); - if (r < 0) - return r; - if (r == 0) - break; - g_ptr_array_add (arr, g_steal_pointer (&word)); - } + r = extract_first_word(&str, &word, NULL, EXTRACT_UNQUOTE | EXTRACT_RELAX); + if (r < 0) + return r; + if (r == 0) + break; + g_ptr_array_add(arr, g_steal_pointer(&word)); + } - g_ptr_array_add (arr, NULL); + g_ptr_array_add(arr, NULL); - *out_strv = (char **) g_ptr_array_free (g_steal_pointer (&arr), FALSE); - return 1; + *out_strv = (char **) g_ptr_array_free(g_steal_pointer(&arr), FALSE); + return 1; } diff --git a/shared/systemd/nm-sd-utils-shared.h b/shared/systemd/nm-sd-utils-shared.h index 75e38b8422..837fa49acb 100644 --- a/shared/systemd/nm-sd-utils-shared.h +++ b/shared/systemd/nm-sd-utils-shared.h @@ -8,38 +8,32 @@ /*****************************************************************************/ -gboolean nm_sd_utils_path_equal (const char *a, const char *b); +gboolean nm_sd_utils_path_equal(const char *a, const char *b); -char *nm_sd_utils_path_simplify (char *path, gboolean kill_dots); +char *nm_sd_utils_path_simplify(char *path, gboolean kill_dots); -const char *nm_sd_utils_path_startswith (const char *path, const char *prefix); +const char *nm_sd_utils_path_startswith(const char *path, const char *prefix); /*****************************************************************************/ -int nm_sd_utils_unbase64char (char ch, gboolean accept_padding_equal); +int nm_sd_utils_unbase64char(char ch, gboolean accept_padding_equal); -int nm_sd_utils_unbase64mem (const char *p, - size_t l, - gboolean secure, - guint8 **mem, - size_t *len); +int nm_sd_utils_unbase64mem(const char *p, size_t l, gboolean secure, guint8 **mem, size_t *len); /*****************************************************************************/ -int nm_sd_dns_name_to_wire_format (const char *domain, - guint8 *buffer, - size_t len, - gboolean canonical); +int +nm_sd_dns_name_to_wire_format(const char *domain, guint8 *buffer, size_t len, gboolean canonical); -int nm_sd_dns_name_is_valid (const char *s); +int nm_sd_dns_name_is_valid(const char *s); gboolean nm_sd_hostname_is_valid(const char *s, bool allow_trailing_dot); /*****************************************************************************/ -gboolean nm_sd_http_url_is_valid_https (const char *url); +gboolean nm_sd_http_url_is_valid_https(const char *url); /*****************************************************************************/ -int nmtst_systemd_extract_first_word_all (const char *str, char ***out_strv); +int nmtst_systemd_extract_first_word_all(const char *str, char ***out_strv); #endif /* __NM_SD_UTILS_SHARED_H__ */ diff --git a/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h b/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h index c11315a532..49f397168c 100644 --- a/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h +++ b/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h @@ -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 -#include + #include + #include -#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 provides char32_t,char16_t. */ -#define HAVE_CHAR32_T 1 -#define HAVE_CHAR16_T 1 + /* we build with C11 and thus 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 */ diff --git a/src/systemd/nm-sd-utils-core.c b/src/systemd/nm-sd-utils-core.c index 4057c70a90..45cfa2613c 100644 --- a/src/systemd/nm-sd-utils-core.c +++ b/src/systemd/nm-sd-utils-core.c @@ -16,12 +16,12 @@ /*****************************************************************************/ NMUuid * -nm_sd_utils_id128_get_machine (NMUuid *out_uuid) +nm_sd_utils_id128_get_machine(NMUuid *out_uuid) { - g_assert (out_uuid); + g_assert(out_uuid); - G_STATIC_ASSERT_EXPR (sizeof (*out_uuid) == sizeof (sd_id128_t)); - if (sd_id128_get_machine ((sd_id128_t *) out_uuid) < 0) - return NULL; - return out_uuid; + G_STATIC_ASSERT_EXPR(sizeof(*out_uuid) == sizeof(sd_id128_t)); + if (sd_id128_get_machine((sd_id128_t *) out_uuid) < 0) + return NULL; + return out_uuid; } diff --git a/src/systemd/nm-sd-utils-core.h b/src/systemd/nm-sd-utils-core.h index 3b0bc23bc7..7771b8408a 100644 --- a/src/systemd/nm-sd-utils-core.h +++ b/src/systemd/nm-sd-utils-core.h @@ -10,7 +10,7 @@ struct _NMUuid; -struct _NMUuid *nm_sd_utils_id128_get_machine (struct _NMUuid *out_uuid); +struct _NMUuid *nm_sd_utils_id128_get_machine(struct _NMUuid *out_uuid); /*****************************************************************************/ diff --git a/src/systemd/nm-sd-utils-dhcp.c b/src/systemd/nm-sd-utils-dhcp.c index 4cfe054c0d..0786ec8de1 100644 --- a/src/systemd/nm-sd-utils-dhcp.c +++ b/src/systemd/nm-sd-utils-dhcp.c @@ -11,30 +11,31 @@ #include "src/libsystemd-network/dhcp-lease-internal.h" int -nm_sd_dhcp_lease_get_private_options (sd_dhcp_lease *lease, nm_sd_dhcp_option **out_options) +nm_sd_dhcp_lease_get_private_options(sd_dhcp_lease *lease, nm_sd_dhcp_option **out_options) { - struct sd_dhcp_raw_option *raw_option; - int cnt = 0; + struct sd_dhcp_raw_option *raw_option; + int cnt = 0; - g_return_val_if_fail (lease, -EINVAL); - g_return_val_if_fail (out_options, -EINVAL); - g_return_val_if_fail (*out_options == NULL, -EINVAL); + g_return_val_if_fail(lease, -EINVAL); + g_return_val_if_fail(out_options, -EINVAL); + g_return_val_if_fail(*out_options == NULL, -EINVAL); - if (lease->private_options == NULL) - return -ENODATA; + if (lease->private_options == NULL) + return -ENODATA; - LIST_FOREACH (options, raw_option, lease->private_options) - cnt++; + LIST_FOREACH(options, raw_option, lease->private_options) + cnt++; - *out_options = g_new (nm_sd_dhcp_option, cnt); - cnt = 0; + *out_options = g_new(nm_sd_dhcp_option, cnt); + cnt = 0; - LIST_FOREACH (options, raw_option, lease->private_options) { - (*out_options)[cnt].code = raw_option->tag; - (*out_options)[cnt].data = raw_option->data; - (*out_options)[cnt].data_len = raw_option->length; - cnt++; - } + LIST_FOREACH(options, raw_option, lease->private_options) + { + (*out_options)[cnt].code = raw_option->tag; + (*out_options)[cnt].data = raw_option->data; + (*out_options)[cnt].data_len = raw_option->length; + cnt++; + } - return cnt; + return cnt; } diff --git a/src/systemd/nm-sd-utils-dhcp.h b/src/systemd/nm-sd-utils-dhcp.h index 5228eb2515..dc35a7b40c 100644 --- a/src/systemd/nm-sd-utils-dhcp.h +++ b/src/systemd/nm-sd-utils-dhcp.h @@ -9,12 +9,11 @@ #include "nm-sd.h" typedef struct { - uint8_t code; - uint8_t data_len; - void *data; + uint8_t code; + uint8_t data_len; + void * data; } nm_sd_dhcp_option; -int -nm_sd_dhcp_lease_get_private_options (sd_dhcp_lease *lease, nm_sd_dhcp_option **out_options); +int nm_sd_dhcp_lease_get_private_options(sd_dhcp_lease *lease, nm_sd_dhcp_option **out_options); #endif /* __NETWORKMANAGER_DHCP_SYSTEMD_UTILS_H__ */ diff --git a/src/systemd/nm-sd.c b/src/systemd/nm-sd.c index a277f4309e..0d452b06ef 100644 --- a/src/systemd/nm-sd.c +++ b/src/systemd/nm-sd.c @@ -15,94 +15,92 @@ *****************************************************************************/ typedef struct SDEventSource { - GSource source; - GPollFD pollfd; - sd_event *event; + GSource source; + GPollFD pollfd; + sd_event *event; } SDEventSource; static gboolean -event_prepare (GSource *source, int *timeout_) +event_prepare(GSource *source, int *timeout_) { - return sd_event_prepare (((SDEventSource *) source)->event) > 0; + return sd_event_prepare(((SDEventSource *) source)->event) > 0; } static gboolean -event_check (GSource *source) +event_check(GSource *source) { - return sd_event_wait (((SDEventSource *) source)->event, 0) > 0; + return sd_event_wait(((SDEventSource *) source)->event, 0) > 0; } static gboolean -event_dispatch (GSource *source, GSourceFunc callback, gpointer user_data) +event_dispatch(GSource *source, GSourceFunc callback, gpointer user_data) { - return sd_event_dispatch (((SDEventSource *) source)->event) > 0; + return sd_event_dispatch(((SDEventSource *) source)->event) > 0; } static void -event_finalize (GSource *source) +event_finalize(GSource *source) { - SDEventSource *s = (SDEventSource *) source; + SDEventSource *s = (SDEventSource *) source; - sd_event_unref (s->event); + sd_event_unref(s->event); } static SDEventSource * -event_create_source (sd_event *event) +event_create_source(sd_event *event) { - static const GSourceFuncs event_funcs = { - .prepare = event_prepare, - .check = event_check, - .dispatch = event_dispatch, - .finalize = event_finalize, - }; - SDEventSource *source; - gboolean is_default_event = FALSE; - int r; + static const GSourceFuncs event_funcs = { + .prepare = event_prepare, + .check = event_check, + .dispatch = event_dispatch, + .finalize = event_finalize, + }; + SDEventSource *source; + gboolean is_default_event = FALSE; + int r; - if (!event) { - is_default_event = TRUE; - r = sd_event_default (&event); - if (r < 0) - g_return_val_if_reached (NULL); - } + if (!event) { + is_default_event = TRUE; + r = sd_event_default(&event); + if (r < 0) + g_return_val_if_reached(NULL); + } - source = (SDEventSource *) g_source_new ((GSourceFuncs *) &event_funcs, sizeof (SDEventSource)); + source = (SDEventSource *) g_source_new((GSourceFuncs *) &event_funcs, sizeof(SDEventSource)); - source->event = is_default_event - ? g_steal_pointer (&event) - : sd_event_ref (event); + source->event = is_default_event ? g_steal_pointer(&event) : sd_event_ref(event); - source->pollfd = (GPollFD) { - .fd = sd_event_get_fd (source->event), - .events = G_IO_IN | G_IO_HUP | G_IO_ERR, - }; + source->pollfd = (GPollFD){ + .fd = sd_event_get_fd(source->event), + .events = G_IO_IN | G_IO_HUP | G_IO_ERR, + }; - g_source_add_poll (&source->source, &source->pollfd); + g_source_add_poll(&source->source, &source->pollfd); - return source; + return source; } static guint -event_attach (sd_event *event, GMainContext *context) +event_attach(sd_event *event, GMainContext *context) { - SDEventSource *source; - guint id; + SDEventSource *source; + guint id; - source = event_create_source (event); + source = event_create_source(event); - g_return_val_if_fail (source, 0); + g_return_val_if_fail(source, 0); - id = g_source_attach ((GSource *) source, context); - g_source_unref ((GSource *) source); + id = g_source_attach((GSource *) source, context); + g_source_unref((GSource *) source); - nm_assert (id != 0); - return id; + nm_assert(id != 0); + return id; } guint -nm_sd_event_attach_default (void) +nm_sd_event_attach_default(void) { - return event_attach (NULL, NULL); + return event_attach(NULL, NULL); } /*****************************************************************************/ @@ -113,4 +111,3 @@ nm_sd_event_attach_default (void) #include "dhcp-lease-internal.h" /*****************************************************************************/ - diff --git a/src/systemd/nm-sd.h b/src/systemd/nm-sd.h index 99904243f8..fad6ae37a1 100644 --- a/src/systemd/nm-sd.h +++ b/src/systemd/nm-sd.h @@ -13,7 +13,7 @@ /*****************************************************************************/ -guint nm_sd_event_attach_default (void); +guint nm_sd_event_attach_default(void); /***************************************************************************** * expose internal systemd API @@ -27,4 +27,3 @@ int dhcp_lease_save(struct sd_dhcp_lease *lease, const char *lease_file); int dhcp_lease_load(struct sd_dhcp_lease **ret, const char *lease_file); #endif /* __NM_SD_H__ */ - diff --git a/src/systemd/sd-adapt-core/nm-sd-adapt-core.c b/src/systemd/sd-adapt-core/nm-sd-adapt-core.c index a9f8bd1c81..a10f7c9139 100644 --- a/src/systemd/sd-adapt-core/nm-sd-adapt-core.c +++ b/src/systemd/sd-adapt-core/nm-sd-adapt-core.c @@ -12,10 +12,10 @@ /*****************************************************************************/ int -asynchronous_close (int fd) { - safe_close (fd); - return -1; +asynchronous_close(int fd) +{ + safe_close(fd); + return -1; } /*****************************************************************************/ - diff --git a/src/systemd/sd-adapt-core/nm-sd-adapt-core.h b/src/systemd/sd-adapt-core/nm-sd-adapt-core.h index 81bc73202d..e563b2bdae 100644 --- a/src/systemd/sd-adapt-core/nm-sd-adapt-core.h +++ b/src/systemd/sd-adapt-core/nm-sd-adapt-core.h @@ -15,7 +15,7 @@ #include "systemd/sd-adapt-shared/nm-sd-adapt-shared.h" #ifndef HAVE_SYS_AUXV_H -#define HAVE_SYS_AUXV_H 0 + #define HAVE_SYS_AUXV_H 0 #endif /***************************************************************************** @@ -25,62 +25,61 @@ #if (NETWORKMANAGER_COMPILATION) & NM_NETWORKMANAGER_COMPILATION_WITH_SYSTEMD -#include -#include -#include -#include -#include -#ifdef HAVE_SYS_AUXV_H -#include -#endif -#include -#include -#include + #include + #include + #include + #include + #include + #ifdef HAVE_SYS_AUXV_H + #include + #endif + #include + #include + #include -/* Missing in Linux 3.2.0, in Ubuntu 12.04 */ -#ifndef BPF_XOR -#define BPF_XOR 0xa0 -#endif + /* Missing in Linux 3.2.0, in Ubuntu 12.04 */ + #ifndef BPF_XOR + #define BPF_XOR 0xa0 + #endif -#ifndef ETHERTYPE_LLDP -#define ETHERTYPE_LLDP 0x88cc -#endif + #ifndef ETHERTYPE_LLDP + #define ETHERTYPE_LLDP 0x88cc + #endif -#ifndef HAVE_SECURE_GETENV -# ifdef HAVE___SECURE_GETENV -# define secure_getenv __secure_getenv -# else -# error neither secure_getenv nor __secure_getenv is available -# endif -#endif + #ifndef HAVE_SECURE_GETENV + #ifdef HAVE___SECURE_GETENV + #define secure_getenv __secure_getenv + #else + #error neither secure_getenv nor __secure_getenv is available + #endif + #endif /*****************************************************************************/ static inline int -sd_notify (int unset_environment, const char *state) +sd_notify(int unset_environment, const char *state) { - return 0; + return 0; } -/* Can't include both net/if.h and linux/if.h; so have to define this here */ -#ifndef IF_NAMESIZE -#define IF_NAMESIZE 16 -#endif + /* Can't include both net/if.h and linux/if.h; so have to define this here */ + #ifndef IF_NAMESIZE + #define IF_NAMESIZE 16 + #endif -#ifndef IFNAMSIZ -#define IFNAMSIZ IF_NAMESIZE -#endif + #ifndef IFNAMSIZ + #define IFNAMSIZ IF_NAMESIZE + #endif -#ifndef MAX_HANDLE_SZ -#define MAX_HANDLE_SZ 128 -#endif + #ifndef MAX_HANDLE_SZ + #define MAX_HANDLE_SZ 128 + #endif -#include "sd-id128.h" -#include "sparse-endian.h" -#include "async.h" -#include "util.h" + #include "sd-id128.h" + #include "sparse-endian.h" + #include "async.h" + #include "util.h" #endif /* (NETWORKMANAGER_COMPILATION) & NM_NETWORKMANAGER_COMPILATION_WITH_SYSTEMD */ #endif /* __NM_SD_ADAPT_CORE_H__ */ -