From 1155cd963fde25cb013da573edc7591c95949834 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 24 Sep 2007 14:58:52 +0000 Subject: [PATCH] 2007-09-24 Dan Williams Patch from Ross Burton * test/nm-tool.c callouts/nm-dhcp-client-action.c src/nm-netlink.c src/vpn-manager/nm-vpn-connection.c libnm-glib/libnm-glib-test.c - warning fixes git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2863 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 11 +++++++++++ callouts/nm-dhcp-client-action.c | 2 +- libnm-glib/libnm-glib-test.c | 3 +-- src/nm-netlink.c | 1 + src/vpn-manager/nm-vpn-connection.c | 2 +- test/nm-tool.c | 3 +-- 6 files changed, 16 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index ca59ec0858..bf6af5f86e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2007-09-24 Dan Williams + + Patch from Ross Burton + + * test/nm-tool.c + callouts/nm-dhcp-client-action.c + src/nm-netlink.c + src/vpn-manager/nm-vpn-connection.c + libnm-glib/libnm-glib-test.c + - warning fixes + 2007-09-24 Dan Williams * libnm-util/nm-utils.h diff --git a/callouts/nm-dhcp-client-action.c b/callouts/nm-dhcp-client-action.c index 96e232d423..67b0ab170c 100644 --- a/callouts/nm-dhcp-client-action.c +++ b/callouts/nm-dhcp-client-action.c @@ -176,7 +176,7 @@ dbus_bool_t wpa_dbus_dict_append_byte_array(DBusMessageIter *iter_dict, } -const char ** ignore[] = {"PATH", "SHLVL", "_", "PWD", "dhc_dbus", NULL}; +static const char * ignore[] = {"PATH", "SHLVL", "_", "PWD", "dhc_dbus", NULL}; dbus_bool_t build_message (DBusMessage * message) diff --git a/libnm-glib/libnm-glib-test.c b/libnm-glib/libnm-glib-test.c index d56a6345b0..8f99cba71f 100644 --- a/libnm-glib/libnm-glib-test.c +++ b/libnm-glib/libnm-glib-test.c @@ -165,13 +165,12 @@ dump_ip4_config (NMIP4Config *cfg) static void dump_access_point (NMAccessPoint *ap) { - GByteArray * ssid; + const GByteArray * ssid; char * str; ssid = nm_access_point_get_ssid (ap); g_print ("\tSsid: %s\n", ssid ? nm_utils_escape_ssid (ssid->data, ssid->len) : "(none)"); - g_byte_array_free (ssid, TRUE); str = nm_access_point_get_hw_address (ap); g_print ("\tMAC Address: %s\n", str); diff --git a/src/nm-netlink.c b/src/nm-netlink.c index 72b4f2f393..3b0871a3ad 100644 --- a/src/nm-netlink.c +++ b/src/nm-netlink.c @@ -19,6 +19,7 @@ * (C) Copyright 2007 Red Hat, Inc. */ +#include #include "nm-netlink.h" #include "nm-utils.h" diff --git a/src/vpn-manager/nm-vpn-connection.c b/src/vpn-manager/nm-vpn-connection.c index 8ea1e5a6be..ccafbca105 100644 --- a/src/vpn-manager/nm-vpn-connection.c +++ b/src/vpn-manager/nm-vpn-connection.c @@ -406,7 +406,7 @@ nm_vpn_connection_activate (NMVPNConnection *connection) routes = nm_vpn_connection_get_routes (connection); org_freedesktop_NetworkManager_VPN_Plugin_connect_async (priv->proxy, nm_vpn_connection_get_vpn_data (connection), - routes, + (const char**)routes, nm_vpn_connection_connect_cb, connection); diff --git a/test/nm-tool.c b/test/nm-tool.c index 45167c896c..ba854a96df 100644 --- a/test/nm-tool.c +++ b/test/nm-tool.c @@ -148,7 +148,7 @@ detail_network (gpointer data, gpointer user_data) GString *str; gboolean active = FALSE; guint32 flags, wpa_flags, rsn_flags; - GByteArray * ssid; + const GByteArray * ssid; char *tmp; flags = nm_access_point_get_flags (ap); @@ -193,7 +193,6 @@ detail_network (gpointer data, gpointer user_data) ssid = nm_access_point_get_ssid (ap); tmp = g_strdup_printf (" %s%s", active ? "*" : "", ssid ? nm_utils_escape_ssid (ssid->data, ssid->len) : "(none)"); - g_byte_array_free (ssid, TRUE); print_string (tmp, str->str);