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

2005-03-15 Ray Strode <rstrode@redhat.com>

Browse Source 
Fix a few -Wall -Werror warnings

	* info-daemon/NetworkManagerInfo.c:
	(main): remove unused loop variable.

	* info-daemon/NetworkManagerInfoDbus.c:
	(nmi_dbus_nm_is_running): comment out
	unused static function

	* src/nm-netlink-monitor.c:
	(receive_pending_bytes):
	initialize output variables to NULL/0,
	on function failure (Problem pointed out
	by Bryan Clark).


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@498 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Ray Strode
2005-03-15 15:08:38 +00:00
parent 278e500f99
commit dfcc12908b
4 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ChangeLog
View File

@@ -1,3 +1,20 @@
2005-03-15 Ray Strode <rstrode@redhat.com>
Fix a few -Wall -Werror warnings
* info-daemon/NetworkManagerInfo.c:
(main): remove unused loop variable.
* info-daemon/NetworkManagerInfoDbus.c:
(nmi_dbus_nm_is_running): comment out
unused static function
* src/nm-netlink-monitor.c:
(receive_pending_bytes):
initialize output variables to NULL/0,
on function failure (Problem pointed out
by Bryan Clark).
2005-03-14 Ray Strode <rstrode@redhat.com> 2005-03-14 Ray Strode <rstrode@redhat.com>
Fourth (probably working) cut at porting to Fourth (probably working) cut at porting to

1
info-daemon/NetworkManagerInfo.c
View File

@@ -179,7 +179,6 @@ int main( int argc, char *argv[] )
DBusConnection *dbus_connection; DBusConnection *dbus_connection;
int err; int err;
NMIAppInfo *app_info = NULL; NMIAppInfo *app_info = NULL;
GMainLoop *loop;
guint notify_id; guint notify_id;
struct poptOption options[] = struct poptOption options[] =

2
info-daemon/NetworkManagerInfoDbus.c
View File

@@ -781,6 +781,7 @@ static DBusHandlerResult nmi_dbus_filter (DBusConnection *connection, DBusMessag
return (handled ? DBUS_HANDLER_RESULT_HANDLED : DBUS_HANDLER_RESULT_NOT_YET_HANDLED); return (handled ? DBUS_HANDLER_RESULT_HANDLED : DBUS_HANDLER_RESULT_NOT_YET_HANDLED);
} }
#if 0
/* /*
* nmi_dbus_nm_is_running * nmi_dbus_nm_is_running
* *
@@ -800,6 +801,7 @@ static gboolean nmi_dbus_nm_is_running (DBusConnection *connection)
dbus_error_free (&error); dbus_error_free (&error);
return (exists); return (exists);
} }
#endif
/* /*

4
src/nm-netlink-monitor.c
View File

@@ -536,7 +536,8 @@ receive_pending_bytes (GIOChannel *channel,
goto out; goto out;
} }
if (pending_bytes->len > 0) out:
if ((pending_bytes->len > 0) && succeeded)
{ {
if (str_return) if (str_return)
*str_return = pending_bytes->str; *str_return = pending_bytes->str;
@@ -556,7 +557,6 @@ receive_pending_bytes (GIOChannel *channel,
*length = 0; *length = 0;
} }
out:
if (pending_bytes != NULL) if (pending_bytes != NULL)
g_string_free (pending_bytes, TRUE); g_string_free (pending_bytes, TRUE);
return succeeded; return succeeded;