diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-02-23 12:17:42 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-02-23 12:33:41 +0100 |
| commit | 434e7b2aa36d8bd5d9988276ae126ae8d646bbcd (patch) | |
| tree | 8445bb08f73f9823f341c505ff2e3a1af4ca7959 | |
| parent | 20b17910d04e2ba09891b09e59bb221c426a43fd (diff) | |
| download | NetworkManager-434e7b2aa36d8bd5d9988276ae126ae8d646bbcd.tar.gz | |
modem: cleanup integer types for ppp-stats signalth/modem-signal-cleanup
In practice, guint32 is identical to guint. However, that is not
guaranteed, and we should keep the types separate.
| -rw-r--r-- | src/devices/bluetooth/nm-device-bt.c | 12 | ||||
| -rw-r--r-- | src/devices/wwan/nm-modem.c | 12 | ||||
| -rw-r--r-- | src/ppp/nm-ppp-manager.c | 7 |
3 files changed, 19 insertions, 12 deletions
diff --git a/src/devices/bluetooth/nm-device-bt.c b/src/devices/bluetooth/nm-device-bt.c index 7528237a69..aed3c3c330 100644 --- a/src/devices/bluetooth/nm-device-bt.c +++ b/src/devices/bluetooth/nm-device-bt.c @@ -362,11 +362,14 @@ complete_connection (NMDevice *device, static void ppp_stats (NMModem *modem, - guint32 in_bytes, - guint32 out_bytes, + guint i_in_bytes, + guint i_out_bytes, gpointer user_data) { - g_signal_emit (NM_DEVICE_BT (user_data), signals[PPP_STATS], 0, in_bytes, out_bytes); + guint32 in_bytes = i_in_bytes; + guint32 out_bytes = i_out_bytes; + + g_signal_emit (NM_DEVICE_BT (user_data), signals[PPP_STATS], 0, (guint) in_bytes, (guint) out_bytes); } static void @@ -1203,7 +1206,8 @@ nm_device_bt_class_init (NMDeviceBtClass *klass) G_SIGNAL_RUN_FIRST, 0, NULL, NULL, NULL, G_TYPE_NONE, 2, - G_TYPE_UINT, G_TYPE_UINT); + G_TYPE_UINT /*guint32 in_bytes*/, + G_TYPE_UINT /*guint32 out_bytes*/); nm_exported_object_class_add_interface (NM_EXPORTED_OBJECT_CLASS (klass), NMDBUS_TYPE_DEVICE_BLUETOOTH_SKELETON, diff --git a/src/devices/wwan/nm-modem.c b/src/devices/wwan/nm-modem.c index 805435676e..e959cffa3d 100644 --- a/src/devices/wwan/nm-modem.c +++ b/src/devices/wwan/nm-modem.c @@ -495,18 +495,19 @@ ppp_ip6_config (NMPPPManager *ppp_manager, static void ppp_stats (NMPPPManager *ppp_manager, - guint32 in_bytes, - guint32 out_bytes, + guint i_in_bytes, + guint i_out_bytes, gpointer user_data) { NMModem *self = NM_MODEM (user_data); NMModemPrivate *priv = NM_MODEM_GET_PRIVATE (self); + guint32 in_bytes = i_in_bytes; + guint32 out_bytes = i_out_bytes; if (priv->in_bytes != in_bytes || priv->out_bytes != out_bytes) { priv->in_bytes = in_bytes; priv->out_bytes = out_bytes; - - g_signal_emit (self, signals[PPP_STATS], 0, in_bytes, out_bytes); + g_signal_emit (self, signals[PPP_STATS], 0, (guint) in_bytes, (guint) out_bytes); } } @@ -1684,7 +1685,8 @@ nm_modem_class_init (NMModemClass *klass) G_SIGNAL_RUN_FIRST, 0, NULL, NULL, NULL, G_TYPE_NONE, 2, - G_TYPE_UINT, G_TYPE_UINT); + G_TYPE_UINT /*guint32 in_bytes*/, + G_TYPE_UINT /*guint32 out_bytes*/); signals[PPP_FAILED] = g_signal_new (NM_MODEM_PPP_FAILED, diff --git a/src/ppp/nm-ppp-manager.c b/src/ppp/nm-ppp-manager.c index bb7821e97b..010866ff65 100644 --- a/src/ppp/nm-ppp-manager.c +++ b/src/ppp/nm-ppp-manager.c @@ -150,8 +150,8 @@ monitor_cb (gpointer user_data) _LOGW ("could not read ppp stats: %s", strerror (errno)); } else { g_signal_emit (manager, signals[STATS], 0, - stats.p.ppp_ibytes, - stats.p.ppp_obytes); + (guint) stats.p.ppp_ibytes, + (guint) stats.p.ppp_obytes); } return TRUE; @@ -1277,7 +1277,8 @@ nm_ppp_manager_class_init (NMPPPManagerClass *manager_class) 0, NULL, NULL, NULL, G_TYPE_NONE, 2, - G_TYPE_UINT, G_TYPE_UINT); + G_TYPE_UINT /*guint32 in_bytes*/, + G_TYPE_UINT /*guint32 out_bytes*/); nm_exported_object_class_add_interface (NM_EXPORTED_OBJECT_CLASS (manager_class), NMDBUS_TYPE_PPP_MANAGER_SKELETON, |