fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-06 07:20:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

clang-format: reformat code with clang 12

Browse source 
The format depends on the version of the tool. Now that Fedora 34 is
released, update to clang 12 (clang-tools-extra-12.0.0-0.3.rc1.fc34.x86_64).
This commit is contained in:
Thomas Haller 2021-05-03 21:48:58 +02:00
parent b32dc4f2cf
commit 21321ac736
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
56 changed files with 223 additions and 222 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/contrib/nm-vpn-plugin-utils.h
View file

@ -8,11 +8,11 @@
#include <NetworkManager.h>
typedef NMVpnEditor *(NMVpnPluginUtilsEditorFactory)(gpointer factory,
NMVpnEditorPlugin *editor_plugin,
NMConnection * connection,
gpointer user_data,
GError ** error);
typedef NMVpnEditor *(NMVpnPluginUtilsEditorFactory) (gpointer factory,
NMVpnEditorPlugin *editor_plugin,
NMConnection * connection,
gpointer user_data,
GError ** error);
NMVpnEditor *nm_vpn_plugin_utils_load_editor(const char * module_name,
const char * factory_name,

4
src/core/devices/nm-device-wireguard.c
View file

@ -66,7 +66,7 @@ G_STATIC_ASSERT(NM_WIREGUARD_SYMMETRIC_KEY_LEN == NMP_WIREGUARD_SYMMETRIC_KEY_LE
* timestamp. */
#define RETRY_IN_MSEC_ASAP ((gint64) G_MAXINT64)
#define RETRY_IN_MSEC_MAX ((gint64)(30 * 60 * 1000))
#define RETRY_IN_MSEC_MAX ((gint64) (30 * 60 * 1000))
typedef enum {
LINK_CONFIG_MODE_FULL,
@ -669,7 +669,7 @@ _peers_resolve_retry_reschedule(NMDeviceWireGuard *self, gint64 new_next_try_at_
* than expected. Also, rate-limit to 500 msec. */
interval_ms = NM_CLAMP((new_next_try_at_nsec - now) / NM_UTILS_NSEC_PER_MSEC,
(gint64) 500,
(gint64)(24 * 60 * 60 * 1000));
(gint64) (24 * 60 * 60 * 1000));
_LOGT(LOGD_DEVICE,
"wireguard-peers: schedule rechecking peer endpoints in %u msec",

2
src/core/devices/nm-device.c
View file

@ -1398,7 +1398,7 @@ _prop_get_ipvx_route_table(NMDevice *self, int addr_family)
_LOGT(LOGD_DEVICE,
"ipv%c.route-table = %u%s",
nm_utils_addr_family_to_char(addr_family),
(guint)(route_table ?: RT_TABLE_MAIN),
(guint) (route_table ?: RT_TABLE_MAIN),
route_table != 0u ? "" : " (policy routing not enabled)");
return route_table;

8
src/core/devices/nm-device.h
View file

@ -109,10 +109,10 @@ nm_device_state_reason_check(NMDeviceStateReason reason)
* NMDeviceOvsBridge and NMDeviceOvsPort. */
#define NM_DEVICE_SLAVES "slaves" /* partially internal */
#define NM_DEVICE_TYPE_DESC "type-desc" /* Internal only */
#define NM_DEVICE_RFKILL_TYPE "rfkill-type" /* Internal only */
#define NM_DEVICE_IFINDEX "ifindex" /* Internal only */
#define NM_DEVICE_MASTER "master" /* Internal only */
#define NM_DEVICE_TYPE_DESC "type-desc" /* Internal only */
#define NM_DEVICE_RFKILL_TYPE "rfkill-type" /* Internal only */
#define NM_DEVICE_IFINDEX "ifindex" /* Internal only */
#define NM_DEVICE_MASTER "master" /* Internal only */
#define NM_DEVICE_HAS_PENDING_ACTION "has-pending-action" /* Internal only */
/* Internal signals */

8
src/core/devices/wifi/nm-device-wifi.c
View file

@ -1885,13 +1885,13 @@ ap_list_dump(gpointer user_data)
_LOGD(LOGD_WIFI_SCAN,
"APs: [now:%u.%03u, last:%s]",
(guint)(now_msec / NM_UTILS_MSEC_PER_SEC),
(guint)(now_msec % NM_UTILS_MSEC_PER_SEC),
(guint) (now_msec / NM_UTILS_MSEC_PER_SEC),
(guint) (now_msec % NM_UTILS_MSEC_PER_SEC),
priv->scan_last_complete_msec > 0
? nm_sprintf_buf(str_buf,
"%u.%03u",
(guint)(priv->scan_last_complete_msec / NM_UTILS_MSEC_PER_SEC),
(guint)(priv->scan_last_complete_msec % NM_UTILS_MSEC_PER_SEC))
(guint) (priv->scan_last_complete_msec / NM_UTILS_MSEC_PER_SEC),
(guint) (priv->scan_last_complete_msec % NM_UTILS_MSEC_PER_SEC))
: "-1");
c_list_for_each_entry (ap, &priv->aps_lst_head, aps_lst)
_ap_dump(self, LOGL_DEBUG, ap, "dump", now_msec);

4
src/core/devices/wifi/nm-wifi-ap.c
View file

@ -537,8 +537,8 @@ nm_wifi_ap_to_string(const NMWifiAP *self, char *str_buf, gulong buf_len, gint64
priv->last_seen_msec != G_MININT64
? nm_sprintf_buf(str_buf_ts,
"%3u.%03us",
(guint)((now_msec - priv->last_seen_msec) / 1000),
(guint)((now_msec - priv->last_seen_msec) % 1000))
(guint) ((now_msec - priv->last_seen_msec) / 1000),
(guint) ((now_msec - priv->last_seen_msec) % 1000))
: " ",
supplicant_id,
export_path);

4
src/core/dhcp/nm-dhcp-helper.c
View file

@ -154,7 +154,7 @@ do_connect:
error->message,
try_count,
(long long) (time_end - time_remaining - time_start) / 1000);
interval = NM_CLAMP((gint64)(100L * (1L << NM_MIN(try_count, 31))), 5000, 100000);
interval = NM_CLAMP((gint64) (100L * (1L << NM_MIN(try_count, 31))), 5000, 100000);
g_usleep(NM_MIN(interval, time_remaining));
g_clear_error(&error);
goto do_connect;
@ -199,7 +199,7 @@ do_notify:
* do some retry. */
if (remaining_time > 0) {
_LOGi("failure to call notify: %s (retry %u)", error->message, try_count);
interval = NM_CLAMP((gint64)(100L * (1L << NM_MIN(try_count, 31))), 5000, 25000);
interval = NM_CLAMP((gint64) (100L * (1L << NM_MIN(try_count, 31))), 5000, 25000);
g_usleep(NM_MIN(interval, remaining_time));
g_clear_error(&error);
goto do_notify;

2
src/core/dhcp/nm-dhcp-systemd.c
View file

@ -153,7 +153,7 @@ lease_to_ip4_config(NMDedupMultiIndex *multi_idx,
nm_dhcp_option_add_option_u64(options,
AF_INET,
NM_DHCP_OPTION_DHCP4_NM_EXPIRY,
(guint64)(ts_time + a_lifetime));
(guint64) (ts_time + a_lifetime));
if (sd_dhcp_lease_get_next_server(lease, &a_next_server) == 0) {
_nm_utils_inet4_ntop(a_next_server.s_addr, addr_str);

16
src/core/ndisc/nm-lndp-ndisc.c
View file

@ -85,14 +85,14 @@ send_rs(NMNDisc *ndisc, GError **error)
static NMIcmpv6RouterPref
_route_preference_coerce(enum ndp_route_preference pref)
{
#define _ASSERT_ENUM(v1, v2) \
G_STMT_START \
{ \
G_STATIC_ASSERT((NMIcmpv6RouterPref)(v1) == (v2)); \
G_STATIC_ASSERT((enum ndp_route_preference)(v2) == (v1)); \
G_STATIC_ASSERT((gint64)(v1) == (v2)); \
G_STATIC_ASSERT((gint64)(v2) == (v1)); \
} \
#define _ASSERT_ENUM(v1, v2) \
G_STMT_START \
{ \
G_STATIC_ASSERT((NMIcmpv6RouterPref) (v1) == (v2)); \
G_STATIC_ASSERT((enum ndp_route_preference) (v2) == (v1)); \
G_STATIC_ASSERT((gint64) (v1) == (v2)); \
G_STATIC_ASSERT((gint64) (v2) == (v1)); \
} \
G_STMT_END
switch (pref) {

4
src/core/ndisc/nm-ndisc.c
View file

@ -806,7 +806,7 @@ solicit_retransmit_time_jitter(gint32 solicit_retransmit_time_msec)
ten_percent = NM_MAX(1, solicit_retransmit_time_msec / 10);
return solicit_retransmit_time_msec - ten_percent
+ ((gint32)(g_random_int() % (2u * ((guint32) ten_percent))));
+ ((gint32) (g_random_int() % (2u * ((guint32) ten_percent))));
}
static gboolean
@ -882,7 +882,7 @@ solicit_timer_start(NMNDisc *ndisc)
* a suitable delay in 2021. Wait only up to 250 msec instead. */
delay_msec =
g_random_int() % ((guint32)(NM_NDISC_RFC4861_MAX_RTR_SOLICITATION_DELAY * 1000 / 4));
g_random_int() % ((guint32) (NM_NDISC_RFC4861_MAX_RTR_SOLICITATION_DELAY * 1000 / 4));
_LOGD("solicit: schedule sending first solicitation (of %d) in %.3f seconds",
priv->router_solicitations,

10
src/core/ndisc/nm-ndisc.h
View file

@ -99,7 +99,7 @@ _nm_ndisc_lifetime_from_expiry(gint64 now_msec, gint64 expiry_msec, gboolean cei
diff += 999;
}
return NM_MIN(diff / 1000, (gint64)(G_MAXUINT32 - 1));
return NM_MIN(diff / 1000, (gint64) (G_MAXUINT32 - 1));
}
/*****************************************************************************/
@ -159,10 +159,10 @@ typedef enum {
#define NM_NDISC_RFC4861_MAX_RTR_SOLICITATION_DELAY 1 /* seconds */
#define NM_NDISC_MAX_ADDRESSES_DEFAULT 16
#define NM_NDISC_ROUTER_SOLICITATIONS_DEFAULT 3 /* RFC4861, MAX_RTR_SOLICITATIONS */
#define NM_NDISC_ROUTER_ADVERTISEMENTS_DEFAULT 3 /* RFC4861, MAX_INITIAL_RTR_ADVERTISEMENTS */
#define NM_NDISC_ROUTER_ADVERT_DELAY 3 /* RFC4861, MIN_DELAY_BETWEEN_RAS */
#define NM_NDISC_ROUTER_ADVERT_INITIAL_INTERVAL 16 /* RFC4861, MAX_INITIAL_RTR_ADVERT_INTERVAL */
#define NM_NDISC_ROUTER_SOLICITATIONS_DEFAULT 3 /* RFC4861, MAX_RTR_SOLICITATIONS */
#define NM_NDISC_ROUTER_ADVERTISEMENTS_DEFAULT 3 /* RFC4861, MAX_INITIAL_RTR_ADVERTISEMENTS */
#define NM_NDISC_ROUTER_ADVERT_DELAY 3 /* RFC4861, MIN_DELAY_BETWEEN_RAS */
#define NM_NDISC_ROUTER_ADVERT_INITIAL_INTERVAL 16 /* RFC4861, MAX_INITIAL_RTR_ADVERT_INTERVAL */
#define NM_NDISC_ROUTER_ADVERT_DELAY_MS 500 /* RFC4861, MAX_RA_DELAY_TIME */
#define NM_NDISC_ROUTER_ADVERT_MAX_INTERVAL 600 /* RFC4861, MaxRtrAdvInterval default */
#define NM_NDISC_ROUTER_LIFETIME 900 /* 1.5 * NM_NDISC_ROUTER_ADVERT_MAX_INTERVAL */

2
src/core/nm-config.c
View file

@ -3144,7 +3144,7 @@ nm_config_class_init(NMConfigClass *config_class)
NM_TYPE_CONFIG_DATA);
G_STATIC_ASSERT_EXPR(sizeof(guint) == sizeof(NMConfigChangeFlags));
G_STATIC_ASSERT_EXPR(((gint64)((NMConfigChangeFlags) -1)) > ((gint64) 0));
G_STATIC_ASSERT_EXPR(((gint64) ((NMConfigChangeFlags) -1)) > ((gint64) 0));
}
static void

4
src/core/nm-connectivity.c
View file

@ -572,7 +572,7 @@ easy_write_cb(void *buffer, size_t size, size_t nmemb, void *userdata)
* Continue receiving... */
cb_data->concheck.response_good_cnt += len;
if (cb_data->concheck.response_good_cnt > (gsize)(100 * 1024)) {
if (cb_data->concheck.response_good_cnt > (gsize) (100 * 1024)) {
/* we expect an empty response. We accept either
* 1) status code 204 and any response
* 2) status code 200 and an empty response.
@ -764,7 +764,7 @@ resolve_cb(GObject *object, GAsyncResult *res, gpointer user_data)
}
#endif
#define SD_RESOLVED_DNS ((guint64)(1LL << 0))
#define SD_RESOLVED_DNS ((guint64) (1LL << 0))
static NMConnectivityState
check_platform_config(NMConnectivity *self,

2
src/core/nm-core-utils.c
View file

@ -2589,7 +2589,7 @@ _host_id_read_timestamp(gboolean use_secret_key_file,
now = time(NULL);
*out_timestamp_ns =
NM_MAX((gint64) 1,
(now * NM_UTILS_NSEC_PER_SEC) - ((gint64)(v % ((guint64)(EPOCH_TWO_YEARS)))));
(now * NM_UTILS_NSEC_PER_SEC) - ((gint64) (v % ((guint64) (EPOCH_TWO_YEARS)))));
return FALSE;
}

2
src/core/nm-hostname-manager.c
View file

@ -182,7 +182,7 @@ nm_hostname_manager_read_hostname(NMHostnameManager *self)
#if defined(HOSTNAME_PERSIST_GENTOO)
hostname = read_hostname_gentoo(HOSTNAME_FILE);
#elif defined(HOSTNAME_PERSIST_SLACKWARE)
hostname = read_hostname_slackware(HOSTNAME_FILE);
hostname = read_hostname_slackware(HOSTNAME_FILE);
#else
if (g_file_get_contents(HOSTNAME_FILE, &hostname, NULL, NULL))
g_strchomp(hostname);

2
src/core/nm-l3-config-data.c
View file

@ -1178,7 +1178,7 @@ _l3_config_best_default_route_find_better(const NMPObject *obj_cur, const NMPObj
return c < 0 ? obj_cur : obj_cmp;
/* as last resort, compare pointers. */
if (((uintptr_t)((void *) (obj_cmp))) < ((uintptr_t)((void *) (obj_cur))))
if (((uintptr_t) ((void *) (obj_cmp))) < ((uintptr_t) ((void *) (obj_cur))))
return obj_cmp;
}
}

2
src/core/nm-l3cfg.c
View file

@ -22,7 +22,7 @@ G_STATIC_ASSERT(NM_ACD_TIMEOUT_RFC5227_MSEC == N_ACD_TIMEOUT_RFC5227);
#define ACD_SUPPORTED_ETH_ALEN ETH_ALEN
#define ACD_ENSURE_RATELIMIT_MSEC ((guint32) 4000u)
#define ACD_WAIT_PROBING_EXTRA_TIME_MSEC ((guint32)(1000u + ACD_ENSURE_RATELIMIT_MSEC))
#define ACD_WAIT_PROBING_EXTRA_TIME_MSEC ((guint32) (1000u + ACD_ENSURE_RATELIMIT_MSEC))
#define ACD_WAIT_PROBING_EXTRA_TIME2_MSEC ((guint32) 1000u)
#define ACD_MAX_TIMEOUT_MSEC ((guint32) 30000u)
#define ACD_WAIT_TIME_PROBING_FULL_RESTART_MSEC ((guint32) 30000u)

2
src/core/nm-sleep-monitor.c
View file

@ -108,7 +108,7 @@ upower_resuming_cb(GDBusProxy *proxy, gpointer user_data)
sleep_signal(user_data, FALSE);
}
#else /* USE_UPOWER */
#else /* USE_UPOWER */
static void
drop_inhibitor(NMSleepMonitor *self, gboolean force)

2
src/core/platform/tests/test-common.h
View file

@ -24,7 +24,7 @@
#define nmtstp_normalize_jiffies_time(requested_value, kernel_value) \
({ \
typeof(kernel_value) _kernel_value = (kernel_value); \
typeof(kernel_value) _kernel_value = (kernel_value); \
typeof(_kernel_value) _requested_value = (requested_value); \
\
/* kernel stores some values (like bridge's forward_delay) in jiffies. When converting

6
src/core/platform/tests/test-platform-general.c
View file

@ -584,7 +584,7 @@ test_platform_ip_address_pretty_sort_cmp(gconstpointer test_data)
nmtst_stable_rand(710086081, rand_map, sizeof(rand_map[0]) * N_ADDRESSES);
for (i = 0; i < N_ADDRESSES; i++) {
NMPlatformIPXAddress *a = (gpointer)(&addresses[i * ELM_SIZE]);
NMPlatformIPXAddress *a = (gpointer) (&addresses[i * ELM_SIZE]);
guint64 r = rand_map[i];
struct in6_addr * a6;
@ -684,10 +684,10 @@ test_platform_ip_address_pretty_sort_cmp(gconstpointer test_data)
(gpointer) test_data);
for (i = 0; i < N_ADDRESSES; i++) {
const NMPlatformIPXAddress *a = (gconstpointer)(&addresses[i * ELM_SIZE]);
const NMPlatformIPXAddress *a = (gconstpointer) (&addresses[i * ELM_SIZE]);
for (j = i + 1; j < N_ADDRESSES; j++) {
const NMPlatformIPXAddress *b = (gconstpointer)(&addresses[j * ELM_SIZE]);
const NMPlatformIPXAddress *b = (gconstpointer) (&addresses[j * ELM_SIZE]);
int c1;
int c2;

17
src/core/settings/nm-settings-connection.c
View file

@ -30,10 +30,11 @@
#define AUTOCONNECT_RETRIES_FOREVER -1
#define AUTOCONNECT_RESET_RETRIES_TIMER 300
#define _NM_SETTINGS_UPDATE2_FLAG_ALL_PERSIST_MODES \
((NMSettingsUpdate2Flags)( \
NM_SETTINGS_UPDATE2_FLAG_TO_DISK | NM_SETTINGS_UPDATE2_FLAG_IN_MEMORY \
| NM_SETTINGS_UPDATE2_FLAG_IN_MEMORY_DETACHED | NM_SETTINGS_UPDATE2_FLAG_IN_MEMORY_ONLY))
#define _NM_SETTINGS_UPDATE2_FLAG_ALL_PERSIST_MODES \
((NMSettingsUpdate2Flags) (NM_SETTINGS_UPDATE2_FLAG_TO_DISK \
| NM_SETTINGS_UPDATE2_FLAG_IN_MEMORY \
| NM_SETTINGS_UPDATE2_FLAG_IN_MEMORY_DETACHED \
| NM_SETTINGS_UPDATE2_FLAG_IN_MEMORY_ONLY))
/*****************************************************************************/
@ -1677,10 +1678,10 @@ impl_settings_connection_update2(NMDBusObject * obj,
g_variant_get(parameters, "(@a{sa{sv}}u@a{sv})", &settings, &flags_u, &args);
if (NM_FLAGS_ANY(flags_u,
~((guint32)(_NM_SETTINGS_UPDATE2_FLAG_ALL_PERSIST_MODES
| NM_SETTINGS_UPDATE2_FLAG_VOLATILE
| NM_SETTINGS_UPDATE2_FLAG_BLOCK_AUTOCONNECT
| NM_SETTINGS_UPDATE2_FLAG_NO_REAPPLY)))) {
~((guint32) (_NM_SETTINGS_UPDATE2_FLAG_ALL_PERSIST_MODES
| NM_SETTINGS_UPDATE2_FLAG_VOLATILE
| NM_SETTINGS_UPDATE2_FLAG_BLOCK_AUTOCONNECT
| NM_SETTINGS_UPDATE2_FLAG_NO_REAPPLY)))) {
error = g_error_new_literal(NM_SETTINGS_ERROR,
NM_SETTINGS_ERROR_INVALID_ARGUMENTS,
"Unknown flags");

10
src/core/settings/nm-settings.c
View file

@ -2689,9 +2689,9 @@ impl_settings_add_connection2(NMDBusObject * obj,
g_variant_get(parameters, "(@a{sa{sv}}u@a{sv})", &settings, &flags_u, &args);
if (NM_FLAGS_ANY(flags_u,
~((guint32)(NM_SETTINGS_ADD_CONNECTION2_FLAG_TO_DISK
| NM_SETTINGS_ADD_CONNECTION2_FLAG_IN_MEMORY
| NM_SETTINGS_ADD_CONNECTION2_FLAG_BLOCK_AUTOCONNECT)))) {
~((guint32) (NM_SETTINGS_ADD_CONNECTION2_FLAG_TO_DISK
| NM_SETTINGS_ADD_CONNECTION2_FLAG_IN_MEMORY
| NM_SETTINGS_ADD_CONNECTION2_FLAG_BLOCK_AUTOCONNECT)))) {
g_dbus_method_invocation_take_error(invocation,
g_error_new_literal(NM_SETTINGS_ERROR,
NM_SETTINGS_ERROR_INVALID_ARGUMENTS,
@ -2831,7 +2831,7 @@ impl_settings_load_connections(NMDBusObject * obj,
g_dbus_method_invocation_return_value(invocation,
g_variant_new("(b^as)",
(gboolean)(!failures),
(gboolean) (!failures),
failures
? (const char **) failures->pdata
: NM_PTRARRAY_EMPTY(const char *)));
@ -3203,7 +3203,7 @@ add_plugin_load_file(NMSettings *self, const char *pname, GError **error)
/* errors after this point are fatal, because we loaded the shared library already. */
if (!g_module_symbol(module, "nm_settings_plugin_factory", (gpointer)(&factory_func))) {
if (!g_module_symbol(module, "nm_settings_plugin_factory", (gpointer) (&factory_func))) {
g_set_error(error,
NM_SETTINGS_ERROR,
NM_SETTINGS_ERROR_FAILED,

12
src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
View file

@ -203,18 +203,18 @@ write_object(NMSetting8021x * s_8021x,
g_return_val_if_fail(ifcfg != NULL, FALSE);
g_return_val_if_fail(objtype != NULL, FALSE);
scheme = (*(objtype->vtable->scheme_func))(s_8021x);
scheme = (*(objtype->vtable->scheme_func)) (s_8021x);
switch (scheme) {
case NM_SETTING_802_1X_CK_SCHEME_UNKNOWN:
break;
case NM_SETTING_802_1X_CK_SCHEME_BLOB:
blob = (*(objtype->vtable->blob_func))(s_8021x);
blob = (*(objtype->vtable->blob_func)) (s_8021x);
break;
case NM_SETTING_802_1X_CK_SCHEME_PATH:
value = (*(objtype->vtable->path_func))(s_8021x);
value = (*(objtype->vtable->path_func)) (s_8021x);
break;
case NM_SETTING_802_1X_CK_SCHEME_PKCS11:
value = (*(objtype->vtable->uri_func))(s_8021x);
value = (*(objtype->vtable->uri_func)) (s_8021x);
break;
default:
g_set_error(error,
@ -227,8 +227,8 @@ write_object(NMSetting8021x * s_8021x,
/* Set the password for certificate/private key. */
nm_sprintf_buf(secret_name, "%s_PASSWORD", objtype->ifcfg_rh_key);
nm_sprintf_buf(secret_flags, "%s_PASSWORD_FLAGS", objtype->ifcfg_rh_key);
password = (*(objtype->vtable->passwd_func))(s_8021x);
flags = (*(objtype->vtable->pwflag_func))(s_8021x);
password = (*(objtype->vtable->passwd_func)) (s_8021x);
flags = (*(objtype->vtable->pwflag_func)) (s_8021x);
set_secret(ifcfg, secrets, secret_name, password, secret_flags, flags);
if (!objtype->vtable->format_func)

4
src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
View file

@ -7295,8 +7295,8 @@ test_write_wifi_wpa_eap_tls(void)
g_object_set(s_8021x, NM_SETTING_802_1X_IDENTITY, "Bill Smith", NULL);
g_object_set(s_8021x,
NM_SETTING_802_1X_PHASE1_AUTH_FLAGS,
(guint)(NM_SETTING_802_1X_AUTH_FLAGS_TLS_1_0_DISABLE
| NM_SETTING_802_1X_AUTH_FLAGS_TLS_1_1_DISABLE),
(guint) (NM_SETTING_802_1X_AUTH_FLAGS_TLS_1_0_DISABLE
| NM_SETTING_802_1X_AUTH_FLAGS_TLS_1_1_DISABLE),
NULL);
nm_setting_802_1x_add_eap_method(s_8021x, "tls");

2
src/core/settings/plugins/ifupdown/nms-ifupdown-parser.c
View file

@ -655,7 +655,7 @@ ifupdown_new_connection_from_if_block(if_block *block, gboolean autoconnect, GEr
NM_SETTING_CONNECTION_UUID,
uuid,
NM_SETTING_CONNECTION_AUTOCONNECT,
(gboolean)(!!autoconnect),
(gboolean) (!!autoconnect),
NULL);
_LOGD("update_connection_setting_from_if_block: name:%s, type:%s, id:%s, uuid: %s",

8
src/core/supplicant/nm-supplicant-types.h
View file

@ -51,9 +51,9 @@ typedef enum {
_NM_SUPPL_CAP_TYPE_NUM,
} NMSupplCapType;
#define NM_SUPPL_CAP_MASK_NO(type) ((NMSupplCapMask)(1llu << ((type) *2u)))
#define NM_SUPPL_CAP_MASK_YES(type) ((NMSupplCapMask)(2llu << ((type) *2u)))
#define NM_SUPPL_CAP_MASK_MASK(type) ((NMSupplCapMask)(3llu << ((type) *2u)))
#define NM_SUPPL_CAP_MASK_NO(type) ((NMSupplCapMask) (1llu << ((type) *2u)))
#define NM_SUPPL_CAP_MASK_YES(type) ((NMSupplCapMask) (2llu << ((type) *2u)))
#define NM_SUPPL_CAP_MASK_MASK(type) ((NMSupplCapMask) (3llu << ((type) *2u)))
typedef enum {
NM_SUPPL_CAP_MASK_NONE = 0,
@ -114,7 +114,7 @@ NM_SUPPL_CAP_MASK_GET(NMSupplCapMask features, NMSupplCapType type)
nm_assert(NM_IN_SET(f, 0, 1, 2));
return (NMTernary)(f - 1);
return (NMTernary) (f - 1);
}
static inline char

4
src/libnm-client-impl/nm-remote-connection.c
View file

@ -183,8 +183,8 @@ nm_remote_connection_commit_changes(NMRemoteConnection *connection,
"Update2",
g_variant_new("(@a{sa{sv}}u@a{sv})",
nm_connection_to_dbus(NM_CONNECTION(connection), NM_CONNECTION_SERIALIZE_ALL),
(guint32)(save_to_disk ? NM_SETTINGS_UPDATE2_FLAG_TO_DISK
: NM_SETTINGS_UPDATE2_FLAG_IN_MEMORY),
(guint32) (save_to_disk ? NM_SETTINGS_UPDATE2_FLAG_TO_DISK
: NM_SETTINGS_UPDATE2_FLAG_IN_MEMORY),
nm_g_variant_singleton_aLsvI()),
G_VARIANT_TYPE("(a{sv})"),
G_DBUS_CALL_FLAGS_NONE,

2
src/libnm-client-impl/tests/test-libnm.c
View file

@ -2725,7 +2725,7 @@ test_types(void)
for (i_type = 0; i_type < G_N_ELEMENTS(get_type_fcns); i_type++) {
nm_auto_unref_gtypeclass GObjectClass *klass_unref = NULL;
GType gtype = (get_type_fcns[i_type])();
GType gtype = (get_type_fcns[i_type]) ();
GObjectClass * klass;
g_assert(g_str_has_prefix(g_type_name(gtype), "NM"));

10
src/libnm-core-aux-intern/nm-libnm-core-utils.h
View file

@ -98,11 +98,11 @@ gboolean nm_utils_vlan_priority_map_parse_str(NMVlanPriorityMap map_type,
/*****************************************************************************/
#define _NM_DEVICE_INTERFACE_FLAG_ALL \
((NMDeviceInterfaceFlags)(NM_DEVICE_INTERFACE_FLAG_UP | NM_DEVICE_INTERFACE_FLAG_LOWER_UP \
| NM_DEVICE_INTERFACE_FLAG_CARRIER \
| NM_DEVICE_INTERFACE_FLAG_PROMISC \
| NM_DEVICE_INTERFACE_FLAG_LLDP_CLIENT_ENABLED))
#define _NM_DEVICE_INTERFACE_FLAG_ALL \
((NMDeviceInterfaceFlags) (NM_DEVICE_INTERFACE_FLAG_UP | NM_DEVICE_INTERFACE_FLAG_LOWER_UP \
| NM_DEVICE_INTERFACE_FLAG_CARRIER \
| NM_DEVICE_INTERFACE_FLAG_PROMISC \
| NM_DEVICE_INTERFACE_FLAG_LLDP_CLIENT_ENABLED))
/*****************************************************************************/

2
src/libnm-core-impl/nm-connection.c
View file

@ -62,7 +62,7 @@ _gtype_to_hash_key(GType gtype)
#if NM_MORE_ASSERTS
_nm_unused const gsize *const test_gtype_typedef = &gtype;
nm_assert((GType)(GPOINTER_TO_SIZE(GSIZE_TO_POINTER(gtype))) == gtype);
nm_assert((GType) (GPOINTER_TO_SIZE(GSIZE_TO_POINTER(gtype))) == gtype);
G_STATIC_ASSERT_EXPR(sizeof(gpointer) >= sizeof(gsize));
G_STATIC_ASSERT_EXPR(sizeof(gsize) == sizeof(GType));
#endif

2
src/libnm-core-impl/nm-crypto-gnutls.c
View file

@ -223,7 +223,7 @@ _nmtst_crypto_encrypt(NMCryptoCipherType cipher,
padded_buf.bin = g_malloc(padded_buf.len);
memcpy(padded_buf.bin, data, data_len);
for (i = 0; i < pad_len; i++)
padded_buf.bin[data_len + i] = (guint8)(pad_len & 0xFF);
padded_buf.bin[data_len + i] = (guint8) (pad_len & 0xFF);
output.len = padded_buf.len;
output.bin = g_malloc(output.len);

2
src/libnm-core-impl/nm-crypto-nss.c
View file

@ -338,7 +338,7 @@ _nmtst_crypto_encrypt(NMCryptoCipherType cipher,
memcpy(padded_buf.bin, data, data_len);
for (i = 0; i < pad_len; i++)
padded_buf.bin[data_len + i] = (guint8)(pad_len & 0xFF);
padded_buf.bin[data_len + i] = (guint8) (pad_len & 0xFF);
output.len = padded_buf.len;
output.bin = g_malloc(output.len);

2
src/libnm-core-impl/nm-crypto.c
View file

@ -70,7 +70,7 @@ nm_crypto_cipher_get_info(NMCryptoCipherType cipher)
for (i = 0; i < (int) G_N_ELEMENTS(cipher_infos); i++) {
const NMCryptoCipherInfo *info = &cipher_infos[i];
nm_assert(info->cipher == (NMCryptoCipherType)(i + 1));
nm_assert(info->cipher == (NMCryptoCipherType) (i + 1));
nm_assert(info->name && info->name[0]);
for (j = 0; j < i; j++)
nm_assert(g_ascii_strcasecmp(info->name, cipher_infos[j].name) != 0);

2
src/libnm-core-impl/nm-dbus-utils.c
View file

@ -132,7 +132,7 @@ _nm_dbus_signal_connect_data(GDBusProxy * proxy,
sd->signal_name = g_strdup(signal_name);
sd->signature = signature;
closure = (swapped ? g_cclosure_new_swap : g_cclosure_new)(c_handler, data, destroy_data);
closure = (swapped ? g_cclosure_new_swap : g_cclosure_new) (c_handler, data, destroy_data);
g_closure_set_marshal(closure, g_cclosure_marshal_generic);
g_closure_set_meta_marshal(closure, sd, dbus_signal_meta_marshal);
g_closure_add_finalize_notifier(closure, sd, dbus_signal_data_free);

2
src/libnm-core-impl/nm-setting-8021x.c
View file

@ -2965,7 +2965,7 @@ verify(NMSetting *setting, NMConnection *connection, GError **error)
if (eap_methods_table[i].v_func == NULL)
continue;
if (!strcmp(eap_methods_table[i].method, method)) {
if (!(*eap_methods_table[i].v_func)(self, FALSE, error))
if (!(*eap_methods_table[i].v_func) (self, FALSE, error))
return FALSE;
break;
}

2
src/libnm-core-impl/nm-setting-ip-tunnel.c
View file

@ -454,7 +454,7 @@ verify(NMSetting *setting, NMConnection *connection, GError **error)
flags = priv->flags;
if (NM_IN_SET(priv->mode, NM_IP_TUNNEL_MODE_IPIP6, NM_IP_TUNNEL_MODE_IP6IP6))
flags &= (guint32)(~_NM_IP_TUNNEL_FLAG_ALL_IP6TNL);
flags &= (guint32) (~_NM_IP_TUNNEL_FLAG_ALL_IP6TNL);
if (flags) {
g_set_error(error,
NM_CONNECTION_ERROR,

2
src/libnm-core-impl/nm-team-utils.c
View file

@ -738,7 +738,7 @@ _team_setting_get_field(const NMTeamSetting *self, const TeamAttrData *attr_data
#if NM_MORE_ASSERTS > 5
if (attr_data->for_master && attr_data->team_attr == NM_TEAM_ATTRIBUTE_MASTER_RUNNER_SYS_PRIO)
nm_assert((gpointer)(((char *) self) + attr_data->field_offset)
nm_assert((gpointer) (((char *) self) + attr_data->field_offset)
== &self->d.master.runner_sys_prio);
#endif

2
src/libnm-core-impl/nm-utils.c
View file

@ -1551,7 +1551,7 @@ nm_utils_ip4_netmask_to_prefix(guint32 netmask)
G_STATIC_ASSERT_EXPR(sizeof(int) == 4);
G_STATIC_ASSERT_EXPR(sizeof(netmask) == 4);
return ((netmask != 0u) ? (guint32)(32 - __builtin_ctz(ntohl(netmask))) : 0u);
return ((netmask != 0u) ? (guint32) (32 - __builtin_ctz(ntohl(netmask))) : 0u);
}
/**

40
src/libnm-core-impl/tests/test-general.c
View file

@ -116,8 +116,8 @@ test_wired_wake_on_lan_enum(void)
G_STATIC_ASSERT_EXPR(sizeof(NMSettingWiredWakeOnLan) < sizeof(gint64));
G_STATIC_ASSERT_EXPR(sizeof(NMSettingWiredWakeOnLan) < sizeof(gint64));
g_assert((((gint64)((NMSettingWiredWakeOnLan) -1)) < 0)
== (((gint64)((_NMSettingWiredWakeOnLan) -1)) < 0));
g_assert((((gint64) ((NMSettingWiredWakeOnLan) -1)) < 0)
== (((gint64) ((_NMSettingWiredWakeOnLan) -1)) < 0));
#define _E(n) \
G_STMT_START \
@ -168,8 +168,8 @@ test_wireless_wake_on_wlan_enum(void)
G_STATIC_ASSERT_EXPR(sizeof(NMSettingWirelessWakeOnWLan) < sizeof(gint64));
G_STATIC_ASSERT_EXPR(sizeof(NMSettingWirelessWakeOnWLan) < sizeof(gint64));
g_assert((((gint64)((NMSettingWirelessWakeOnWLan) -1)) < 0)
== (((gint64)((_NMSettingWirelessWakeOnWLan) -1)) < 0));
g_assert((((gint64) ((NMSettingWirelessWakeOnWLan) -1)) < 0)
== (((gint64) ((_NMSettingWirelessWakeOnWLan) -1)) < 0));
#define _E(n) \
G_STMT_START \
@ -221,8 +221,8 @@ test_device_wifi_capabilities(void)
G_STATIC_ASSERT_EXPR(sizeof(NMDeviceWifiCapabilities) < sizeof(gint64));
G_STATIC_ASSERT_EXPR(sizeof(NMDeviceWifiCapabilities) < sizeof(gint64));
g_assert((((gint64)((NMDeviceWifiCapabilities) -1)) < 0)
== (((gint64)((_NMDeviceWifiCapabilities) -1)) < 0));
g_assert((((gint64) ((NMDeviceWifiCapabilities) -1)) < 0)
== (((gint64) ((_NMDeviceWifiCapabilities) -1)) < 0));
#define _E(n) \
G_STMT_START \
@ -274,7 +274,7 @@ test_80211_mode(void)
G_STATIC_ASSERT_EXPR(sizeof(NM80211Mode) < sizeof(gint64));
G_STATIC_ASSERT_EXPR(sizeof(NM80211Mode) < sizeof(gint64));
g_assert((((gint64)((NM80211Mode) -1)) < 0) == (((gint64)((_NM80211Mode) -1)) < 0));
g_assert((((gint64) ((NM80211Mode) -1)) < 0) == (((gint64) ((_NM80211Mode) -1)) < 0));
#define _E(n) \
G_STMT_START \
@ -318,7 +318,7 @@ test_vlan_flags(void)
G_STATIC_ASSERT_EXPR(sizeof(NMVlanFlags) < sizeof(gint64));
G_STATIC_ASSERT_EXPR(sizeof(NMVlanFlags) < sizeof(gint64));
g_assert((((gint64)((NMVlanFlags) -1)) < 0) == (((gint64)((_NMVlanFlags) -1)) < 0));
g_assert((((gint64) ((NMVlanFlags) -1)) < 0) == (((gint64) ((_NMVlanFlags) -1)) < 0));
#define _E(n) \
G_STMT_START \
@ -8499,8 +8499,8 @@ enum TEST_IS_POWER_OF_TWP_ENUM_UNSIGNED_64 {
G_STMT_START \
{ \
typeof(x) x1 = (x); \
type x2 = (type) x1; \
gboolean val; \
type x2 = (type) x1; \
gboolean val; \
\
val = nm_utils_is_power_of_two(x1); \
g_assert_cmpint(expect, ==, val); \
@ -8696,7 +8696,7 @@ _test_find_binary_search_do_uint32(const int *int_array, gsize len)
g_assert(v > -OFFSET);
g_assert(v < OFFSET);
g_assert(idx == 0 || v > int_array[idx - 1]);
array[idx] = (guint32)(int_array[idx] + OFFSET);
array[idx] = (guint32) (int_array[idx] + OFFSET);
if (array[idx] == NEEDLE)
expected_result = idx;
}
@ -10496,15 +10496,15 @@ test_nm_utils_wifi_ghz_freqs(void)
static void
test_vpn_connection_state_reason(void)
{
#define ASSERT(v1, v2) \
G_STMT_START \
{ \
G_STATIC_ASSERT((gint64)(v1) == v2); \
G_STATIC_ASSERT((gint64)(v2) == v1); \
\
nm_assert(((NMActiveConnectionStateReason)(int) (v1)) == v2); \
nm_assert(((NMVpnConnectionStateReason)(int) (v2)) == v1); \
} \
#define ASSERT(v1, v2) \
G_STMT_START \
{ \
G_STATIC_ASSERT((gint64) (v1) == v2); \
G_STATIC_ASSERT((gint64) (v2) == v1); \
\
nm_assert(((NMActiveConnectionStateReason) (int) (v1)) == v2); \
nm_assert(((NMVpnConnectionStateReason) (int) (v2)) == v1); \
} \
G_STMT_END
ASSERT(NM_VPN_CONNECTION_STATE_REASON_UNKNOWN, NM_ACTIVE_CONNECTION_STATE_REASON_UNKNOWN);

2
src/libnm-core-impl/tests/test-setting.c
View file

@ -3890,7 +3890,7 @@ test_parse_tc_handle(void)
#define _parse_tc_handle_inval(str) _parse_tc_handle(str, TC_H_UNSPEC)
#define _parse_tc_handle_valid(str, maj, min) \
_parse_tc_handle(str, TC_H_MAKE(((guint32)(maj)) << 16, ((guint16)(min))))
_parse_tc_handle(str, TC_H_MAKE(((guint32) (maj)) << 16, ((guint16) (min))))
_parse_tc_handle_inval("");
_parse_tc_handle_inval(" ");

8
src/libnm-core-intern/nm-core-internal.h
View file

@ -101,10 +101,10 @@
/*****************************************************************************/
#define NM_SETTING_SECRET_FLAG_ALL \
((NMSettingSecretFlags)(NM_SETTING_SECRET_FLAG_NONE | NM_SETTING_SECRET_FLAG_AGENT_OWNED \
| NM_SETTING_SECRET_FLAG_NOT_SAVED \
| NM_SETTING_SECRET_FLAG_NOT_REQUIRED))
#define NM_SETTING_SECRET_FLAG_ALL \
((NMSettingSecretFlags) (NM_SETTING_SECRET_FLAG_NONE | NM_SETTING_SECRET_FLAG_AGENT_OWNED \
| NM_SETTING_SECRET_FLAG_NOT_SAVED \
| NM_SETTING_SECRET_FLAG_NOT_REQUIRED))
static inline gboolean
_nm_setting_secret_flags_valid(NMSettingSecretFlags flags)

18
src/libnm-glib-aux/nm-glib.h
View file

@ -55,7 +55,7 @@ __g_type_ensure(GType type)
gpointer *_pp = (gpointer *) (pp); \
gpointer _p; \
/* This assignment is needed to avoid a gcc warning */ \
GDestroyNotify _destroy = (GDestroyNotify)(destroy); \
GDestroyNotify _destroy = (GDestroyNotify) (destroy); \
\
_p = *_pp; \
if (_p) { \
@ -413,8 +413,8 @@ _nm_g_hash_table_get_keys_as_array(GHashTable *hash_table, guint *length)
#define g_steal_pointer(pp) \
({ \
typeof(*(pp)) *const _pp = (pp); \
typeof(*_pp) _p = *_pp; \
typeof(*(pp)) *const _pp = (pp); \
typeof(*_pp) _p = *_pp; \
_nm_unused const void *const _p_type_check = _p; \
\
*_pp = NULL; \
@ -571,7 +571,7 @@ _nm_g_value_unset(GValue *value)
/* G_SOURCE_FUNC was added in 2.57.2. */
#undef G_SOURCE_FUNC
#define G_SOURCE_FUNC(f) ((GSourceFunc)(void (*)(void))(f))
#define G_SOURCE_FUNC(f) ((GSourceFunc) (void (*)(void)) (f))
/*****************************************************************************/
@ -609,8 +609,8 @@ _g_atomic_pointer_set(void **atomic, void *newval)
#undef g_atomic_pointer_set
#define g_atomic_pointer_set(atomic, newval) \
({ \
typeof(*atomic) *const _atomic = (atomic); \
typeof(*_atomic) const _newval = (newval); \
typeof(*atomic) *const _atomic = (atomic); \
typeof(*_atomic) const _newval = (newval); \
_nm_unused gconstpointer const _val_type_check = _newval; \
\
(void) (0 ? (gpointer) * (_atomic) : NULL); \
@ -633,9 +633,9 @@ _g_atomic_pointer_compare_and_exchange(void **atomic, void *oldval, void *newval
#undef g_atomic_pointer_compare_and_exchange
#define g_atomic_pointer_compare_and_exchange(atomic, oldval, newval) \
({ \
typeof(*atomic) *const _atomic = (atomic); \
typeof(*_atomic) const _oldval = (oldval); \
typeof(*_atomic) const _newval = (newval); \
typeof(*atomic) *const _atomic = (atomic); \
typeof(*_atomic) const _oldval = (oldval); \
typeof(*_atomic) const _newval = (newval); \
_nm_unused gconstpointer const _val_type_check = _oldval; \
\
(void) (0 ? (gpointer) * (_atomic) : NULL); \

4
src/libnm-glib-aux/nm-hash-utils.c
View file

@ -58,9 +58,9 @@ again:
* doesn't use siphash itself. */
h = c_siphash_hash(t_arr.v8, (const guint8 *) &t_arr, sizeof(t_arr));
if (sizeof(h) > sizeof(guint))
t_arr.vuint = t_arr.vuint ^ ((guint)(h & G_MAXUINT)) ^ ((guint)(h >> 32));
t_arr.vuint = t_arr.vuint ^ ((guint) (h & G_MAXUINT)) ^ ((guint) (h >> 32));
else
t_arr.vuint = t_arr.vuint ^ ((guint)(h & G_MAXUINT));
t_arr.vuint = t_arr.vuint ^ ((guint) (h & G_MAXUINT));
if (!g_once_init_enter(&g_lock)) {
/* lost a race. The random key is already initialized. */

26
src/libnm-glib-aux/nm-hash-utils.h
View file

@ -88,7 +88,7 @@ nm_hash_complete(NMHashState *state)
/* we don't ever want to return a zero hash.
*
* NMPObject requires that in _idx_obj_part(), and it's just a good idea. */
return (((guint)(h >> 32)) ^ ((guint) h)) ?: 1396707757u;
return (((guint) (h >> 32)) ^ ((guint) h)) ?: 1396707757u;
}
static inline void
@ -122,33 +122,33 @@ nm_hash_update_bool(NMHashState *state, bool val)
nm_hash_update(state, &val, sizeof(val));
}
#define _NM_HASH_COMBINE_BOOLS_x_1(t, y) ((y) ? ((t)(1ull << 0)) : ((t) 0ull))
#define _NM_HASH_COMBINE_BOOLS_x_1(t, y) ((y) ? ((t) (1ull << 0)) : ((t) 0ull))
#define _NM_HASH_COMBINE_BOOLS_x_2(t, y, ...) \
((y) ? ((t)(1ull << 1)) : ((t) 0ull)) | _NM_HASH_COMBINE_BOOLS_x_1(t, __VA_ARGS__)
((y) ? ((t) (1ull << 1)) : ((t) 0ull)) | _NM_HASH_COMBINE_BOOLS_x_1(t, __VA_ARGS__)
#define _NM_HASH_COMBINE_BOOLS_x_3(t, y, ...) \
((y) ? ((t)(1ull << 2)) : ((t) 0ull)) | _NM_HASH_COMBINE_BOOLS_x_2(t, __VA_ARGS__)
((y) ? ((t) (1ull << 2)) : ((t) 0ull)) | _NM_HASH_COMBINE_BOOLS_x_2(t, __VA_ARGS__)
#define _NM_HASH_COMBINE_BOOLS_x_4(t, y, ...) \
((y) ? ((t)(1ull << 3)) : ((t) 0ull)) | _NM_HASH_COMBINE_BOOLS_x_3(t, __VA_ARGS__)
((y) ? ((t) (1ull << 3)) : ((t) 0ull)) | _NM_HASH_COMBINE_BOOLS_x_3(t, __VA_ARGS__)
#define _NM_HASH_COMBINE_BOOLS_x_5(t, y, ...) \
((y) ? ((t)(1ull << 4)) : ((t) 0ull)) | _NM_HASH_COMBINE_BOOLS_x_4(t, __VA_ARGS__)
((y) ? ((t) (1ull << 4)) : ((t) 0ull)) | _NM_HASH_COMBINE_BOOLS_x_4(t, __VA_ARGS__)
#define _NM_HASH_COMBINE_BOOLS_x_6(t, y, ...) \
((y) ? ((t)(1ull << 5)) : ((t) 0ull)) | _NM_HASH_COMBINE_BOOLS_x_5(t, __VA_ARGS__)
((y) ? ((t) (1ull << 5)) : ((t) 0ull)) | _NM_HASH_COMBINE_BOOLS_x_5(t, __VA_ARGS__)
#define _NM_HASH_COMBINE_BOOLS_x_7(t, y, ...) \
((y) ? ((t)(1ull << 6)) : ((t) 0ull)) | _NM_HASH_COMBINE_BOOLS_x_6(t, __VA_ARGS__)
((y) ? ((t) (1ull << 6)) : ((t) 0ull)) | _NM_HASH_COMBINE_BOOLS_x_6(t, __VA_ARGS__)
#define _NM_HASH_COMBINE_BOOLS_x_8(t, y, ...) \
((y) ? ((t)(1ull << 7)) : ((t) 0ull)) | _NM_HASH_COMBINE_BOOLS_x_7(t, __VA_ARGS__)
((y) ? ((t) (1ull << 7)) : ((t) 0ull)) | _NM_HASH_COMBINE_BOOLS_x_7(t, __VA_ARGS__)
#define _NM_HASH_COMBINE_BOOLS_x_9(t, y, ...) \
((y) ? ((t)(1ull << 8)) : ((t) 0ull)) \
((y) ? ((t) (1ull << 8)) : ((t) 0ull)) \
| (G_STATIC_ASSERT_EXPR(sizeof(t) >= 2), (_NM_HASH_COMBINE_BOOLS_x_8(t, __VA_ARGS__)))
#define _NM_HASH_COMBINE_BOOLS_x_10(t, y, ...) \
((y) ? ((t)(1ull << 9)) : ((t) 0ull)) | _NM_HASH_COMBINE_BOOLS_x_9(t, __VA_ARGS__)
((y) ? ((t) (1ull << 9)) : ((t) 0ull)) | _NM_HASH_COMBINE_BOOLS_x_9(t, __VA_ARGS__)
#define _NM_HASH_COMBINE_BOOLS_x_11(t, y, ...) \
((y) ? ((t)(1ull << 10)) : ((t) 0ull)) | _NM_HASH_COMBINE_BOOLS_x_10(t, __VA_ARGS__)
((y) ? ((t) (1ull << 10)) : ((t) 0ull)) | _NM_HASH_COMBINE_BOOLS_x_10(t, __VA_ARGS__)
#define _NM_HASH_COMBINE_BOOLS_n2(t, n, ...) _NM_HASH_COMBINE_BOOLS_x_##n(t, __VA_ARGS__)
#define _NM_HASH_COMBINE_BOOLS_n(t, n, ...) _NM_HASH_COMBINE_BOOLS_n2(t, n, __VA_ARGS__)
#define NM_HASH_COMBINE_BOOLS(type, ...) \
((type)(_NM_HASH_COMBINE_BOOLS_n(type, NM_NARG(__VA_ARGS__), __VA_ARGS__)))
((type) (_NM_HASH_COMBINE_BOOLS_n(type, NM_NARG(__VA_ARGS__), __VA_ARGS__)))
#define nm_hash_update_bools(state, ...) \
nm_hash_update_val(state, NM_HASH_COMBINE_BOOLS(guint8, __VA_ARGS__))

62
src/libnm-glib-aux/nm-macros-internal.h
View file

@ -665,15 +665,15 @@ NM_G_ERROR_MSG(GError *error)
* It's useful to check the let the compiler ensure that @value is
* of a certain type. */
#define _NM_ENSURE_TYPE(type, value) (_Generic((value), type : (value)))
#define _NM_ENSURE_TYPE_CONST(type, value) \
(_Generic((value), const type \
: ((const type)(value)), const type const \
: ((const type)(value)), type \
: ((const type)(value)), type const \
: ((const type)(value))))
#define _NM_ENSURE_TYPE_CONST(type, value) \
(_Generic((value), const type \
: ((const type) (value)), const type const \
: ((const type) (value)), type \
: ((const type) (value)), type const \
: ((const type) (value))))
#else
#define _NM_ENSURE_TYPE(type, value) (value)
#define _NM_ENSURE_TYPE_CONST(type, value) ((const type)(value))
#define _NM_ENSURE_TYPE_CONST(type, value) ((const type) (value))
#endif
#if _NM_CC_SUPPORT_GENERIC && (!defined(__clang__) || __clang_major__ > 3)
@ -691,8 +691,8 @@ NM_G_ERROR_MSG(GError *error)
* of such argument. */
#define NM_CAST_PPTR(type, arg) \
({ \
typeof(*(arg)) *const _arg = (arg); \
typeof(*_arg) _arg2 = _arg ? *_arg : NULL; \
typeof(*(arg)) *const _arg = (arg); \
typeof(*_arg) _arg2 = _arg ? *_arg : NULL; \
_nm_unused const void *const _arg3 = _arg2; \
\
(type **) _arg; \
@ -1009,10 +1009,10 @@ nm_g_object_unref(gpointer obj)
* */
#define nm_g_object_ref_set(pp, obj) \
({ \
typeof(*(pp)) *const _pp = (pp); \
typeof(*_pp) const _obj = (obj); \
typeof(*_pp) _p; \
gboolean _changed = FALSE; \
typeof(*(pp)) *const _pp = (pp); \
typeof(*_pp) const _obj = (obj); \
typeof(*_pp) _p; \
gboolean _changed = FALSE; \
\
nm_assert(!_pp || !*_pp || G_IS_OBJECT(*_pp)); \
nm_assert(!_obj || G_IS_OBJECT(_obj)); \
@ -1028,10 +1028,10 @@ nm_g_object_unref(gpointer obj)
#define nm_g_object_ref_set_take(pp, obj) \
({ \
typeof(*(pp)) *const _pp = (pp); \
typeof(*_pp) const _obj = (obj); \
typeof(*_pp) _p; \
gboolean _changed = FALSE; \
typeof(*(pp)) *const _pp = (pp); \
typeof(*_pp) const _obj = (obj); \
typeof(*_pp) _p; \
gboolean _changed = FALSE; \
\
nm_assert(!_pp || !*_pp || G_IS_OBJECT(*_pp)); \
nm_assert(!_obj || G_IS_OBJECT(_obj)); \
@ -1531,8 +1531,8 @@ nm_memdup(gconstpointer data, gsize size)
#define nm_malloc_maybe_a(alloca_maxlen, bytes, to_free) \
({ \
const gsize _bytes = (bytes); \
typeof(to_free) _to_free = (to_free); \
const gsize _bytes = (bytes); \
typeof(to_free) _to_free = (to_free); \
typeof(*_to_free) _ptr; \
\
G_STATIC_ASSERT_EXPR((alloca_maxlen) <= 500u); \
@ -1551,8 +1551,8 @@ nm_memdup(gconstpointer data, gsize size)
#define nm_malloc0_maybe_a(alloca_maxlen, bytes, to_free) \
({ \
const gsize _bytes = (bytes); \
typeof(to_free) _to_free = (to_free); \
const gsize _bytes = (bytes); \
typeof(to_free) _to_free = (to_free); \
typeof(*_to_free) _ptr; \
\
G_STATIC_ASSERT_EXPR((alloca_maxlen) <= 500u); \
@ -1575,9 +1575,9 @@ nm_memdup(gconstpointer data, gsize size)
#define nm_memdup_maybe_a(alloca_maxlen, data, size, to_free) \
({ \
const gsize _size = (size); \
typeof(to_free) _to_free_md = (to_free); \
typeof(*_to_free_md) _ptr_md = NULL; \
const gsize _size = (size); \
typeof(to_free) _to_free_md = (to_free); \
typeof(*_to_free_md) _ptr_md = NULL; \
\
nm_assert(_to_free_md && !*_to_free_md); \
\
@ -1675,10 +1675,10 @@ _nm_strndup_a_step(char *s, const char *str, gsize len)
: g_strdup_printf("%lu", (unsigned long) (val)), unsigned long long \
: g_strdup_printf("%llu", (unsigned long long) (val)))
#else
#define nm_strdup_int(val) \
((sizeof(val) == sizeof(guint64) && ((typeof(val)) - 1) > 0) \
? g_strdup_printf("%" G_GUINT64_FORMAT, (guint64)(val)) \
: g_strdup_printf("%" G_GINT64_FORMAT, (gint64)(val)))
#define nm_strdup_int(val) \
((sizeof(val) == sizeof(guint64) && ((typeof(val)) -1) > 0) \
? g_strdup_printf("%" G_GUINT64_FORMAT, (guint64) (val)) \
: g_strdup_printf("%" G_GINT64_FORMAT, (gint64) (val)))
#endif
/*****************************************************************************/
@ -1810,8 +1810,8 @@ nm_decode_version(guint version, guint *major, guint *minor, guint *micro)
* must not be larger than 300 bytes, as this gets stack allocated. */
#define nm_sprintf_buf_unsafe_a(bufsize, format, ...) \
({ \
char *_buf; \
int _buf_len; \
char * _buf; \
int _buf_len; \
typeof(bufsize) _bufsize = (bufsize); \
\
nm_assert(_bufsize <= 300); \
@ -1841,7 +1841,7 @@ nm_decode_version(guint version, guint *major, guint *minor, guint *micro)
char * _buf2; \
\
nm_assert(_p_val_to_free && !*_p_val_to_free); \
if (NM_STRLEN(format) <= 290 && _name_len < (gsize)(290 - NM_STRLEN(format))) \
if (NM_STRLEN(format) <= 290 && _name_len < (gsize) (290 - NM_STRLEN(format))) \
_buf2 = nm_sprintf_buf_unsafe_a(NM_STRLEN(format) + _name_len, format, _name); \
else { \
_buf2 = g_strdup_printf(format, _name); \

2
src/libnm-glib-aux/nm-ref-string.h
View file

@ -125,7 +125,7 @@ NM_REF_STRING_UPCAST(const char *str)
if (!str)
return NULL;
rstr = (gpointer)(((char *) str) - G_STRUCT_OFFSET(NMRefString, str));
rstr = (gpointer) (((char *) str) - G_STRUCT_OFFSET(NMRefString, str));
nm_assert_nm_ref_string(rstr);
return rstr;
}

2
src/libnm-glib-aux/nm-shared-utils.c
View file

@ -3124,7 +3124,7 @@ nm_utils_fd_wait_for_event(int fd, int event, gint64 timeout_nsec)
if (timeout_nsec < 0)
pts = NULL;
else {
ts.tv_sec = (time_t)(timeout_nsec / NM_UTILS_NSEC_PER_SEC);
ts.tv_sec = (time_t) (timeout_nsec / NM_UTILS_NSEC_PER_SEC);
ts.tv_nsec = (long int) (timeout_nsec % NM_UTILS_NSEC_PER_SEC);
pts = &ts;
}

16
src/libnm-glib-aux/nm-shared-utils.h
View file

@ -84,12 +84,12 @@ G_STATIC_ASSERT(sizeof(int) == sizeof(gint32));
_Generic((value), int : TRUE); \
})
#else
#define _NM_INT_LE_MAXINT32(value) \
({ \
_nm_unused typeof(value) _value = (value); \
_nm_unused const int *_p_value = &_value; \
\
TRUE; \
#define _NM_INT_LE_MAXINT32(value) \
({ \
_nm_unused typeof(value) _value = (value); \
_nm_unused const int * _p_value = &_value; \
\
TRUE; \
})
#endif
@ -422,8 +422,8 @@ nm_utils_ip_address_same_prefix(int addr_family,
/*****************************************************************************/
#define NM_IPV4LL_NETWORK ((in_addr_t)(htonl(0xA9FE0000lu)))
#define NM_IPV4LL_NETMASK ((in_addr_t)(htonl(0xFFFF0000lu)))
#define NM_IPV4LL_NETWORK ((in_addr_t) (htonl(0xA9FE0000lu)))
#define NM_IPV4LL_NETMASK ((in_addr_t) (htonl(0xFFFF0000lu)))
static inline gboolean
nm_utils_ip4_address_is_link_local(in_addr_t addr)

8
src/libnm-glib-aux/nm-test-utils.h
View file

@ -1246,10 +1246,10 @@ _nmtst_main_loop_quit_on_notify(GObject *object, GParamSpec *pspec, gpointer use
nm_auto_destroy_and_unref_gsource GSource *_source_poll = NULL; \
GMainContext * _context = (context); \
gboolean _had_timeout = FALSE; \
typeof(timeout_msec) _timeout_msec0 = (timeout_msec); \
typeof(poll_msec) _poll_msec0 = (poll_msec); \
gint64 _timeout_msec = _timeout_msec0; \
guint _poll_msec = _poll_msec0; \
typeof(timeout_msec) _timeout_msec0 = (timeout_msec); \
typeof(poll_msec) _poll_msec0 = (poll_msec); \
gint64 _timeout_msec = _timeout_msec0; \
guint _poll_msec = _poll_msec0; \
\
g_assert_cmpint(_timeout_msec0, ==, _timeout_msec); \
g_assert_cmpint(_poll_msec0, ==, _poll_msec); \

6
src/libnm-platform/nm-linux-platform.c
View file

@ -189,10 +189,10 @@ G_STATIC_ASSERT(RTA_MAX == (__RTA_MAX - 1));
#define WG_CMD_GET_DEVICE 0
#define WG_CMD_SET_DEVICE 1
#define WGDEVICE_F_REPLACE_PEERS ((guint32)(1U << 0))
#define WGDEVICE_F_REPLACE_PEERS ((guint32) (1U << 0))
#define WGPEER_F_REMOVE_ME ((guint32)(1U << 0))
#define WGPEER_F_REPLACE_ALLOWEDIPS ((guint32)(1U << 1))
#define WGPEER_F_REMOVE_ME ((guint32) (1U << 0))
#define WGPEER_F_REPLACE_ALLOWEDIPS ((guint32) (1U << 1))
#define WGDEVICE_A_UNSPEC 0
#define WGDEVICE_A_IFINDEX 1

8
src/libnm-platform/nm-platform-utils.c
View file

@ -310,7 +310,7 @@ _ethtool_edata_to_string(gpointer edata, gsize edata_size, char *sbuf, gsize sbu
#define ethtool_cmd_speed_set(pedata, speed) \
G_STMT_START \
{ \
(pedata)->speed = (guint16)(speed); \
(pedata)->speed = (guint16) (speed); \
} \
G_STMT_END
#endif
@ -545,7 +545,7 @@ _ASSERT_ethtool_feature_infos(void)
found[_NM_ETHTOOL_ID_FEATURE_AS_IDX(inf->ethtool_id)] = TRUE;
kstate.idx_kernel_name = inf->n_kernel_names - 1;
g_assert((guint) kstate.idx_kernel_name == (guint)(inf->n_kernel_names - 1));
g_assert((guint) kstate.idx_kernel_name == (guint) (inf->n_kernel_names - 1));
n += inf->n_kernel_names;
for (k = 0; k < inf->n_kernel_names; k++) {
@ -613,7 +613,7 @@ ethtool_get_features(SocketHandle *shandle)
continue;
i_block = ((guint) i_feature) / 32u;
i_flag = (guint32)(1u << (((guint) i_feature) % 32u));
i_flag = (guint32) (1u << (((guint) i_feature) % 32u));
if (!states) {
states = g_malloc0(
@ -824,7 +824,7 @@ nmp_utils_ethtool_set_features(
gboolean is_requested;
i_block = s->idx_ss_features / 32u;
i_flag = (guint32)(1u << (s->idx_ss_features % 32u));
i_flag = (guint32) (1u << (s->idx_ss_features % 32u));
sfeatures->features[i_block].valid |= i_flag;

8
src/libnm-platform/nm-platform.h
View file

@ -53,10 +53,10 @@ typedef gboolean (*NMPObjectPredicateFunc)(const NMPObject *obj, gpointer user_d
/* Define of the IN6_ADDR_GEN_MODE_* values to workaround old kernel headers
* that don't define it. */
#define NM_IN6_ADDR_GEN_MODE_UNKNOWN 255 /* no corresponding value. */
#define NM_IN6_ADDR_GEN_MODE_EUI64 0 /* IN6_ADDR_GEN_MODE_EUI64 */
#define NM_IN6_ADDR_GEN_MODE_NONE 1 /* IN6_ADDR_GEN_MODE_NONE */
#define NM_IN6_ADDR_GEN_MODE_STABLE_PRIVACY 2 /* IN6_ADDR_GEN_MODE_STABLE_PRIVACY */
#define NM_IN6_ADDR_GEN_MODE_RANDOM 3 /* IN6_ADDR_GEN_MODE_RANDOM */
#define NM_IN6_ADDR_GEN_MODE_EUI64 0 /* IN6_ADDR_GEN_MODE_EUI64 */
#define NM_IN6_ADDR_GEN_MODE_NONE 1 /* IN6_ADDR_GEN_MODE_NONE */
#define NM_IN6_ADDR_GEN_MODE_STABLE_PRIVACY 2 /* IN6_ADDR_GEN_MODE_STABLE_PRIVACY */
#define NM_IN6_ADDR_GEN_MODE_RANDOM 3 /* IN6_ADDR_GEN_MODE_RANDOM */
#define NM_IFF_MULTI_QUEUE 0x0100 /* IFF_MULTI_QUEUE */

24
src/libnm-platform/nmp-object.h
View file

@ -611,18 +611,18 @@ nmp_object_unref(const NMPObject *obj)
}
}
#define nm_clear_nmp_object(ptr) \
({ \
typeof(ptr) _ptr = (ptr); \
typeof(*_ptr) _pptr; \
gboolean _changed = FALSE; \
\
if (_ptr && (_pptr = *_ptr)) { \
*_ptr = NULL; \
nmp_object_unref(_pptr); \
_changed = TRUE; \
} \
_changed; \
#define nm_clear_nmp_object(ptr) \
({ \
typeof(ptr) _ptr = (ptr); \
typeof(*_ptr) _pptr; \
gboolean _changed = FALSE; \
\
if (_ptr && (_pptr = *_ptr)) { \
*_ptr = NULL; \
nmp_object_unref(_pptr); \
_changed = TRUE; \
} \
_changed; \
})
static inline gboolean

2
src/libnm-platform/wifi/nm-wifi-utils-wext.c
View file

@ -82,7 +82,7 @@ iw_freq_to_uint32(const struct iw_freq *freq)
else if (freq->m == 14)
return 2484;
}
return (guint32)((((double) freq->m) * nm_utils_exp10(freq->e)) / 1000000.0);
return (guint32) ((((double) freq->m) * nm_utils_exp10(freq->e)) / 1000000.0);
}
static void

24
src/libnm-std-aux/nm-std-aux.h
View file

@ -244,8 +244,8 @@ nm_mult_clamped_u(unsigned a, unsigned b)
#define NM_CLAMP(x, low, high) __NM_CLAMP(NM_UNIQ, x, NM_UNIQ, low, NM_UNIQ, high)
#define __NM_CLAMP(xq, x, lowq, low, highq, high) \
({ \
typeof(x) NM_UNIQ_T(X, xq) = (x); \
typeof(low) NM_UNIQ_T(LOW, lowq) = (low); \
typeof(x) NM_UNIQ_T(X, xq) = (x); \
typeof(low) NM_UNIQ_T(LOW, lowq) = (low); \
typeof(high) NM_UNIQ_T(HIGH, highq) = (high); \
\
((NM_UNIQ_T(X, xq) > NM_UNIQ_T(HIGH, highq)) ? NM_UNIQ_T(HIGH, highq) \
@ -273,7 +273,7 @@ nm_mult_clamped_u(unsigned a, unsigned b)
* For negative values and zero, this always returns FALSE. */
#define nm_utils_is_power_of_two(x) \
({ \
typeof(x) _x2 = (x); \
typeof(x) _x2 = (x); \
const typeof(_x2) _X_0 = ((typeof(_x2)) 0); \
const typeof(_x2) _X_1 = ((typeof(_x2)) 1); \
\
@ -293,7 +293,7 @@ nm_mult_clamped_u(unsigned a, unsigned b)
do { \
typeof(*(p_a)) *const _p_a = (p_a); \
typeof(*(p_a)) *const _p_b = (p_b); \
typeof(*(p_a)) _tmp; \
typeof(*(p_a)) _tmp; \
\
_tmp = *_p_a; \
*_p_a = *_p_b; \
@ -726,8 +726,8 @@ _nm_auto_fclose(FILE **pfd)
#define nm_clear_pointer(pp, destroy) \
({ \
typeof(*(pp)) *_pp = (pp); \
typeof(*_pp) _p; \
int _changed = false; \
typeof(*_pp) _p; \
int _changed = false; \
\
if (_pp && (_p = *_pp)) { \
_nm_unused const void *_p_check_is_pointer = _p; \
@ -755,8 +755,8 @@ _nm_auto_fclose(FILE **pfd)
#define nm_steal_pointer(pp) \
({ \
typeof(*(pp)) *const _pp = (pp); \
typeof(*_pp) _p = *_pp; \
typeof(*(pp)) *const _pp = (pp); \
typeof(*_pp) _p = *_pp; \
_nm_unused const void *const _p_type_check = _p; \
\
*_pp = NULL; \
@ -773,7 +773,7 @@ _nm_auto_fclose(FILE **pfd)
#define nm_steal_int(p_val) \
({ \
typeof(p_val) const _p_val = (p_val); \
typeof(*_p_val) _val = 0; \
typeof(*_p_val) _val = 0; \
\
if (_p_val && (_val = *_p_val)) { \
*_p_val = 0; \
@ -912,11 +912,11 @@ nm_ptr_to_uintptr(const void *p)
/*****************************************************************************/
#define NM_AF_UNSPEC 0 /* AF_UNSPEC */
#define NM_AF_INET 2 /* AF_INET */
#define NM_AF_UNSPEC 0 /* AF_UNSPEC */
#define NM_AF_INET 2 /* AF_INET */
#define NM_AF_INET6 10 /* AF_INET6 */
#define NM_AF_INET_SIZE 4 /* sizeof (in_addr_t) */
#define NM_AF_INET_SIZE 4 /* sizeof (in_addr_t) */
#define NM_AF_INET6_SIZE 16 /* sizeof (stuct in6_addr) */
static inline char

2
src/nm-cloud-setup/nmcs-provider-ec2.c
View file

@ -354,7 +354,7 @@ _get_config_metadata_ready_check(long response_code,
hwaddr = nmcs_utils_hwaddr_normalize(
cur_line,
cur_line[cur_line_len - 1u] == '/' ? (gssize)(cur_line_len - 1u) : -1);
cur_line[cur_line_len - 1u] == '/' ? (gssize) (cur_line_len - 1u) : -1);
if (!hwaddr)
continue;