colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

platform: fix some bogus compiler warnings

Browse Source 
platform/nm-linux-platform.c: In function 'delete_object':
platform/nm-linux-platform.c:102:13: error: 'cached_object' may be used uninitialized in this function [-Werror=maybe-uninitialized]
  if (object && *object) {
             ^
platform/nm-linux-platform.c:1019:35: note: 'cached_object' was declared here

Except that it won't be, but I guess the gsystem auto* stuff is
confusing the compiler.
This commit is contained in:
Dan Williams
2013-08-07 15:47:47 -05:00
parent b637c6a101
commit 37efd55699
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/platform/nm-linux-platform.c
View File

@@ -1016,7 +1016,7 @@ delete_object (NMPlatform *platform, struct nl_object *obj)
{ {
NMLinuxPlatformPrivate *priv = NM_LINUX_PLATFORM_GET_PRIVATE (platform); NMLinuxPlatformPrivate *priv = NM_LINUX_PLATFORM_GET_PRIVATE (platform);
auto_nl_object struct nl_object *object = obj; auto_nl_object struct nl_object *object = obj;
auto_nl_object struct nl_object *cached_object; auto_nl_object struct nl_object *cached_object = NULL;
int nle; int nle;
/* FIXME: For some reason the result of build_rtnl_route() is not suitable /* FIXME: For some reason the result of build_rtnl_route() is not suitable
@@ -1421,9 +1421,8 @@ link_uses_arp (NMPlatform *platform, int ifindex)
static gboolean static gboolean
link_change_flags (NMPlatform *platform, int ifindex, unsigned int flags, gboolean value) link_change_flags (NMPlatform *platform, int ifindex, unsigned int flags, gboolean value)
{ {
auto_nl_object struct rtnl_link *change; auto_nl_object struct rtnl_link *change = rtnl_link_alloc ();
change = rtnl_link_alloc ();
g_return_val_if_fail (change != NULL, FALSE); g_return_val_if_fail (change != NULL, FALSE);
if (value) if (value)
@@ -1654,9 +1653,8 @@ link_get_address (NMPlatform *platform, int ifindex, size_t *length)
static gboolean static gboolean
link_set_mtu (NMPlatform *platform, int ifindex, guint32 mtu) link_set_mtu (NMPlatform *platform, int ifindex, guint32 mtu)
{ {
auto_nl_object struct rtnl_link *change; auto_nl_object struct rtnl_link *change = rtnl_link_alloc ();
change = rtnl_link_alloc ();
g_return_val_if_fail (change != NULL, FALSE); g_return_val_if_fail (change != NULL, FALSE);
rtnl_link_set_mtu (change, mtu); rtnl_link_set_mtu (change, mtu);
@@ -1731,10 +1729,9 @@ vlan_set_egress_map (NMPlatform *platform, int ifindex, int from, int to)
static gboolean static gboolean
link_enslave (NMPlatform *platform, int master, int slave) link_enslave (NMPlatform *platform, int master, int slave)
{ {
auto_nl_object struct rtnl_link *change; auto_nl_object struct rtnl_link *change = rtnl_link_alloc ();
change = rtnl_link_alloc (); g_return_val_if_fail (change != NULL, FALSE);
g_assert (change);
rtnl_link_set_master (change, master); rtnl_link_set_master (change, master);
@@ -1974,7 +1971,7 @@ static gboolean
macvlan_get_properties (NMPlatform *platform, int ifindex, NMPlatformMacvlanProperties *props) macvlan_get_properties (NMPlatform *platform, int ifindex, NMPlatformMacvlanProperties *props)
{ {
NMLinuxPlatformPrivate *priv = NM_LINUX_PLATFORM_GET_PRIVATE (platform); NMLinuxPlatformPrivate *priv = NM_LINUX_PLATFORM_GET_PRIVATE (platform);
auto_nl_object struct rtnl_link *rtnllink; auto_nl_object struct rtnl_link *rtnllink = NULL;
int err; int err;
rtnllink = link_get (platform, ifindex); rtnllink = link_get (platform, ifindex);