2007-09-24 Dan Williams <dcbw@redhat.com>

Patch from Ross Burton <ross@burtonini.com>

	* 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
This commit is contained in:
Dan Williams 2007-09-24 14:58:52 +00:00
parent 336def9492
commit 1155cd963f
6 changed files with 16 additions and 6 deletions

View file

@ -1,3 +1,14 @@
2007-09-24 Dan Williams <dcbw@redhat.com>
Patch from Ross Burton <ross@burtonini.com>
* 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 <dcbw@redhat.com>
* libnm-util/nm-utils.h

View file

@ -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)

View file

@ -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);

View file

@ -19,6 +19,7 @@
* (C) Copyright 2007 Red Hat, Inc.
*/
#include <asm/types.h>
#include "nm-netlink.h"
#include "nm-utils.h"

View file

@ -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);

View file

@ -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);