Fix some warnings and other errors
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2755 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
@@ -279,7 +279,7 @@ nm_object_get_boolean_property (NMObject *object,
|
|||||||
const char *interface,
|
const char *interface,
|
||||||
const char *prop_name)
|
const char *prop_name)
|
||||||
{
|
{
|
||||||
gboolean b;
|
gboolean b = FALSE; // FIXME: somehow convey failure if needed
|
||||||
GValue value = {0,};
|
GValue value = {0,};
|
||||||
|
|
||||||
if (nm_object_get_property (object, interface, prop_name, &value))
|
if (nm_object_get_property (object, interface, prop_name, &value))
|
||||||
@@ -293,7 +293,7 @@ nm_object_get_byte_property (NMObject *object,
|
|||||||
const char *interface,
|
const char *interface,
|
||||||
const char *prop_name)
|
const char *prop_name)
|
||||||
{
|
{
|
||||||
gint8 b;
|
gint8 b = G_MAXINT8;
|
||||||
GValue value = {0,};
|
GValue value = {0,};
|
||||||
|
|
||||||
if (nm_object_get_property (object, interface, prop_name, &value))
|
if (nm_object_get_property (object, interface, prop_name, &value))
|
||||||
@@ -307,7 +307,7 @@ nm_object_get_double_property (NMObject *object,
|
|||||||
const char *interface,
|
const char *interface,
|
||||||
const char *prop_name)
|
const char *prop_name)
|
||||||
{
|
{
|
||||||
gdouble d;
|
gdouble d = G_MAXDOUBLE;
|
||||||
GValue value = {0,};
|
GValue value = {0,};
|
||||||
|
|
||||||
if (nm_object_get_property (object, interface, prop_name, &value))
|
if (nm_object_get_property (object, interface, prop_name, &value))
|
||||||
|
@@ -417,7 +417,8 @@ done:
|
|||||||
nm_vpn_manager_dispose (vpn_manager);
|
nm_vpn_manager_dispose (vpn_manager);
|
||||||
|
|
||||||
nm_hal_manager_destroy (hal_manager);
|
nm_hal_manager_destroy (hal_manager);
|
||||||
nm_policy_destroy (policy);
|
if (policy)
|
||||||
|
nm_policy_destroy (policy);
|
||||||
|
|
||||||
if (manager)
|
if (manager)
|
||||||
g_object_unref (manager);
|
g_object_unref (manager);
|
||||||
|
@@ -481,7 +481,6 @@ void nm_system_set_mtu (NMDevice *dev)
|
|||||||
struct rtnl_link * old;
|
struct rtnl_link * old;
|
||||||
unsigned long mtu;
|
unsigned long mtu;
|
||||||
struct nl_handle * nlh;
|
struct nl_handle * nlh;
|
||||||
const char * iface;
|
|
||||||
|
|
||||||
mtu = nm_system_get_mtu (dev);
|
mtu = nm_system_get_mtu (dev);
|
||||||
if (!mtu)
|
if (!mtu)
|
||||||
|
@@ -23,6 +23,8 @@
|
|||||||
#include "nm-utils.h"
|
#include "nm-utils.h"
|
||||||
|
|
||||||
#include <glib.h>
|
#include <glib.h>
|
||||||
|
#include <pthread.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
static struct nl_cache * link_cache = NULL;
|
static struct nl_cache * link_cache = NULL;
|
||||||
static struct nl_handle * def_nl_handle = NULL;
|
static struct nl_handle * def_nl_handle = NULL;
|
||||||
@@ -68,8 +70,6 @@ int
|
|||||||
nm_netlink_iface_to_index (const char *iface)
|
nm_netlink_iface_to_index (const char *iface)
|
||||||
{
|
{
|
||||||
struct nl_cache * cache;
|
struct nl_cache * cache;
|
||||||
struct nl_handle * nlh;
|
|
||||||
int i;
|
|
||||||
|
|
||||||
g_return_val_if_fail (iface != NULL, -1);
|
g_return_val_if_fail (iface != NULL, -1);
|
||||||
|
|
||||||
|
@@ -4,6 +4,7 @@
|
|||||||
#include <sys/wait.h>
|
#include <sys/wait.h>
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
#include "nm-ppp-manager.h"
|
#include "nm-ppp-manager.h"
|
||||||
#include "nm-dbus-manager.h"
|
#include "nm-dbus-manager.h"
|
||||||
@@ -548,6 +549,7 @@ nm_ppp_manager_start (NMPPPManager *manager,
|
|||||||
nm_debug ("Command line: %s", cmd_str);
|
nm_debug ("Command line: %s", cmd_str);
|
||||||
g_free (cmd_str);
|
g_free (cmd_str);
|
||||||
|
|
||||||
|
priv->pid = 0;
|
||||||
if (!g_spawn_async (NULL, (char **) ppp_cmd->array->pdata, NULL,
|
if (!g_spawn_async (NULL, (char **) ppp_cmd->array->pdata, NULL,
|
||||||
G_SPAWN_DO_NOT_REAP_CHILD,
|
G_SPAWN_DO_NOT_REAP_CHILD,
|
||||||
pppd_child_setup,
|
pppd_child_setup,
|
||||||
|
Reference in New Issue
Block a user