fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-28 18:00:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

all/style: write elvis operator ?: without space

Browse source 
By far most of the time, we write "?:" and not "? :". Adjust
the few places that don't.
This commit is contained in:
Thomas Haller 2018-08-09 16:41:28 +02:00
parent 8d1c256290
commit 852abf3d3d
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clients/common/nm-meta-setting-desc.c
View file

@ -1854,7 +1854,7 @@ _set_fcn_vpn_service_type (ARGS_SET_FCN)
gs_free char *service_name = NULL;
service_name = nm_vpn_plugin_info_list_find_service_type (nm_vpn_get_plugin_infos (), value);
g_object_set (setting, property_info->property_name, service_name ? : value, NULL);
g_object_set (setting, property_info->property_name, service_name ?: value, NULL);
return TRUE;
}

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

@ -422,7 +422,7 @@ _nm_auto_freev (gpointer ptr)
static inline const char *
NM_G_ERROR_MSG (GError *error)
{
return error ? (error->message ? : "(null)") : "(no-error)"; \
return error ? (error->message ?: "(null)") : "(no-error)"; \
}
/*****************************************************************************/

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

@ -10963,7 +10963,7 @@ reapply_cb (NMDevice *self,
nm_device_sys_iface_state_set (self, NM_DEVICE_SYS_IFACE_STATE_MANAGED);
if (!check_and_reapply_connection (self,
connection ? : (NMConnection *) nm_device_get_settings_connection (self),
connection ?: (NMConnection *) nm_device_get_settings_connection (self),
version_id,
&audit_args,
&local)) {

2
src/ndisc/nm-ndisc.c
View file

@ -1192,7 +1192,7 @@ set_property (GObject *object, guint prop_id,
switch (prop_id) {
case PROP_PLATFORM:
/* construct-only */
priv->platform = g_value_get_object (value) ? : NM_PLATFORM_GET;
priv->platform = g_value_get_object (value) ?: NM_PLATFORM_GET;
if (!priv->platform)
g_return_if_reached ();

2
src/platform/nm-netlink.c
View file

@ -1399,7 +1399,7 @@ nl_recv (struct nl_sock *sk, struct sockaddr_nl *nla,
if (page_size == 0)
page_size = getpagesize() * 4;
iov.iov_len = sk->s_bufsize ? : page_size;
iov.iov_len = sk->s_bufsize ?: page_size;
iov.iov_base = g_malloc (iov.iov_len);
if ( creds