diff options
| -rw-r--r-- | src/dhcp-manager/nm-dhcp-client.c | 2 | ||||
| -rw-r--r-- | src/dhcp-manager/nm-dhcp-client.h | 2 | ||||
| -rw-r--r-- | src/dhcp-manager/nm-dhcp-listener.c | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/dhcp-manager/nm-dhcp-client.c b/src/dhcp-manager/nm-dhcp-client.c index 0ffd573849..28959da3df 100644 --- a/src/dhcp-manager/nm-dhcp-client.c +++ b/src/dhcp-manager/nm-dhcp-client.c @@ -717,7 +717,7 @@ copy_option (const char * key, gboolean nm_dhcp_client_handle_event (gpointer unused, const char *iface, - gint64 pid, + gint pid, GHashTable *options, const char *reason, NMDhcpClient *self) diff --git a/src/dhcp-manager/nm-dhcp-client.h b/src/dhcp-manager/nm-dhcp-client.h index d732aa05ef..3329fe38f3 100644 --- a/src/dhcp-manager/nm-dhcp-client.h +++ b/src/dhcp-manager/nm-dhcp-client.h @@ -156,7 +156,7 @@ void nm_dhcp_client_set_state (NMDhcpClient *self, gboolean nm_dhcp_client_handle_event (gpointer unused, const char *iface, - gint64 pid, + gint pid, GHashTable *options, const char *reason, NMDhcpClient *self); diff --git a/src/dhcp-manager/nm-dhcp-listener.c b/src/dhcp-manager/nm-dhcp-listener.c index ce6dfafad4..07c153e72a 100644 --- a/src/dhcp-manager/nm-dhcp-listener.c +++ b/src/dhcp-manager/nm-dhcp-listener.c @@ -121,7 +121,7 @@ handle_event (DBusGProxy *proxy, char *iface = NULL; char *pid_str = NULL; char *reason = NULL; - gint32 pid; + gint pid; gboolean handled = FALSE; iface = get_option (options, "interface"); @@ -131,8 +131,8 @@ handle_event (DBusGProxy *proxy, } pid_str = get_option (options, "pid"); - pid = (gint32) nm_utils_ascii_str_to_int64 (pid_str, 10, 0, G_MAXINT32, -1); - if (pid == -1 || pid != (GPid) pid) { + pid = nm_utils_ascii_str_to_int64 (pid_str, 10, 0, G_MAXINT32, -1); + if (pid == -1) { nm_log_warn (LOGD_DHCP, "DHCP event: couldn't convert PID '%s' to an integer", pid_str ? pid_str : "(null)"); goto out; } @@ -283,7 +283,7 @@ nm_dhcp_listener_class_init (NMDhcpListenerClass *listener_class) G_TYPE_BOOLEAN, /* listeners return TRUE if handled */ 4, G_TYPE_STRING, /* iface */ - G_TYPE_INT64, /* pid */ + G_TYPE_INT, /* pid */ G_TYPE_HASH_TABLE, /* options */ G_TYPE_STRING); /* reason */ } |