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

device/wwan: use cleanup macro in get_capabilities()

Browse source
This commit is contained in:
Thomas Haller 2022-01-28 21:28:32 +01:00
parent c0f9925de8
commit 748feaee89
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/core/devices/wwan/nm-modem-broadband.c
View file

@ -199,10 +199,11 @@ get_capabilities(NMModem *_self,
NMDeviceModemCapabilities *modem_caps,
NMDeviceModemCapabilities *current_caps)
{
NMModemBroadband *self = NM_MODEM_BROADBAND(_self);
MMModemCapability all_supported = MM_MODEM_CAPABILITY_NONE;
MMModemCapability *supported;
guint n_supported;
NMModemBroadband *self = NM_MODEM_BROADBAND(_self);
MMModemCapability all_supported = MM_MODEM_CAPABILITY_NONE;
gs_free MMModemCapability *supported = NULL;
guint n_supported;
guint i;
G_STATIC_ASSERT(MM_MODEM_CAPABILITY_POTS == (guint64) NM_DEVICE_MODEM_CAPABILITY_POTS);
G_STATIC_ASSERT(MM_MODEM_CAPABILITY_CDMA_EVDO
@ -214,12 +215,8 @@ get_capabilities(NMModem *_self,
/* For now, we don't care about the capability combinations, just merge all
* combinations in a single mask */
if (mm_modem_get_supported_capabilities(self->_priv.modem_iface, &supported, &n_supported)) {
guint i;
for (i = 0; i < n_supported; i++)
all_supported |= supported[i];
g_free(supported);
}
*modem_caps = (NMDeviceModemCapabilities) all_supported;