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

core: use guint type for glib's source ids

Browse source
This commit is contained in:
Thomas Haller 2016-01-20 10:27:26 +01:00
parent a99a0d194d
commit 26721b8a88
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/dnsmasq-manager/nm-dnsmasq-manager.c
View file

@ -38,7 +38,7 @@ typedef struct {
char *iface;
char *pidfile;
GPid pid;
guint32 dm_watch_id;
guint dm_watch_id;
} NMDnsMasqManagerPrivate;
#define NM_DNSMASQ_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DNSMASQ_MANAGER, NMDnsMasqManagerPrivate))
@ -170,7 +170,7 @@ dm_exit_code (guint dm_exit_status)
case 4:
msg = "Memory allocation failure";
break;
case 5:
case 5:
msg = "Other problem";
break;
default:
@ -200,7 +200,7 @@ dm_watch_cb (GPid pid, gint status, gpointer user_data)
} else {
nm_log_warn (LOGD_SHARING, "dnsmasq died from an unknown cause");
}
priv->pid = 0;
priv->dm_watch_id = 0;

4
src/ppp-manager/nm-ppp-manager.c
View file

@ -66,8 +66,8 @@ typedef struct {
NMActRequestGetSecretsCallId secrets_id;
const char *secrets_setting_name;
guint32 ppp_watch_id;
guint32 ppp_timeout_handler;
guint ppp_watch_id;
guint ppp_timeout_handler;
/* Monitoring */
char *ip_iface;