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

2005-06-09 Dan Williams <dcbw@redhat.com>

Browse Source 
Patch from Robert Love:
	* src/NetworkManagerDevice.c
	  src/NetworkManagerUtils.c
		- 64-bit build fixes


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@660 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2005-06-10 03:47:47 +00:00
parent 8897c59efa
commit b3bcfac619
3 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,3 +1,10 @@
2005-06-09 Dan Williams <dcbw@redhat.com>
Patch from Robert Love:
* src/NetworkManagerDevice.c
src/NetworkManagerUtils.c
- 64-bit build fixes
2005-06-09 Dan Williams <dcbw@redhat.com> 2005-06-09 Dan Williams <dcbw@redhat.com>
Patch from Kay Sievers and Robert Love: Patch from Kay Sievers and Robert Love:

10
src/NetworkManagerDevice.c
View File

@@ -1620,7 +1620,7 @@ gboolean nm_completion_device_is_up_test (int tries, nm_completion_args args)
{ {
NMDevice *dev = args[0]; NMDevice *dev = args[0];
gboolean *err = args[1]; gboolean *err = args[1];
gboolean cancelable = (gboolean)args[2]; gboolean cancelable = GPOINTER_TO_INT (args[2]);
g_return_val_if_fail (dev != NULL, TRUE); g_return_val_if_fail (dev != NULL, TRUE);
g_return_val_if_fail (err != NULL, TRUE); g_return_val_if_fail (err != NULL, TRUE);
@@ -1653,7 +1653,7 @@ gboolean nm_device_bring_up_wait (NMDevice *dev, gboolean cancelable)
args[0] = dev; args[0] = dev;
args[1] = &err; args[1] = &err;
args[2] = (void *)cancelable; args[2] = GINT_TO_POINTER (cancelable);
nm_wait_for_completion (400, G_USEC_PER_SEC / 200, NULL, nm_completion_device_is_up_test, args); nm_wait_for_completion (400, G_USEC_PER_SEC / 200, NULL, nm_completion_device_is_up_test, args);
if (err) if (err)
nm_info ("failed to bring device up"); nm_info ("failed to bring device up");
@@ -1671,7 +1671,7 @@ gboolean nm_completion_device_is_down_test (int tries, nm_completion_args args)
{ {
NMDevice *dev = args[0]; NMDevice *dev = args[0];
gboolean *err = args[1]; gboolean *err = args[1];
gboolean cancelable = (gboolean)args[2]; gboolean cancelable = GPOINTER_TO_INT (args[2]);
g_return_val_if_fail (dev != NULL, TRUE); g_return_val_if_fail (dev != NULL, TRUE);
g_return_val_if_fail (err != NULL, TRUE); g_return_val_if_fail (err != NULL, TRUE);
@@ -1697,7 +1697,7 @@ gboolean nm_device_bring_down_wait (NMDevice *dev, gboolean cancelable)
args[0] = dev; args[0] = dev;
args[1] = &err; args[1] = &err;
args[2] = (void *)cancelable; args[2] = GINT_TO_POINTER (cancelable);
nm_wait_for_completion(400, G_USEC_PER_SEC / 200, NULL, nm_wait_for_completion(400, G_USEC_PER_SEC / 200, NULL,
nm_completion_device_is_down_test, args); nm_completion_device_is_down_test, args);
if (err) if (err)
@@ -2278,7 +2278,7 @@ static gboolean nm_dwwfl_test (int tries, nm_completion_args args)
guint * assoc_count = args[1]; guint * assoc_count = args[1];
double * last_freq = args[2]; double * last_freq = args[2];
char * essid = args[3]; char * essid = args[3];
int required = (int) args[4]; int required = GPOINTER_TO_INT (args[4]);
double cur_freq = nm_device_get_frequency (dev); double cur_freq = nm_device_get_frequency (dev);
gboolean assoc = nm_device_wireless_is_associated (dev); gboolean assoc = nm_device_wireless_is_associated (dev);

12
src/NetworkManagerUtils.c
View File

@@ -732,8 +732,8 @@ gboolean nm_completion_boolean_test(int tries, nm_completion_args args)
{ {
gboolean *condition = (gboolean *)args[0]; gboolean *condition = (gboolean *)args[0];
char *message = (char *)args[1]; char *message = (char *)args[1];
int log_level = (int)args[2]; int log_level = GPOINTER_TO_INT (args[2]);
int log_interval = (int)args[3]; int log_interval = GPOINTER_TO_INT (args[3]);
g_return_val_if_fail (condition != NULL, TRUE); g_return_val_if_fail (condition != NULL, TRUE);
@@ -760,8 +760,8 @@ gboolean nm_completion_boolean_function1_test(int tries,
{ {
nm_completion_boolean_function_1 condition = args[0]; nm_completion_boolean_function_1 condition = args[0];
char *message = args[1]; char *message = args[1];
int log_level = (int)args[2]; int log_level = GPOINTER_TO_INT (args[2]);
int log_interval = (int)args[3]; int log_interval = GPOINTER_TO_INT (args[3]);
u_int64_t arg0; u_int64_t arg0;
memcpy(&arg0, &args[4], sizeof (arg0)); memcpy(&arg0, &args[4], sizeof (arg0));
@@ -783,8 +783,8 @@ gboolean nm_completion_boolean_function2_test(int tries,
{ {
nm_completion_boolean_function_2 condition = args[0]; nm_completion_boolean_function_2 condition = args[0];
char *message = args[1]; char *message = args[1];
int log_level = (int)args[2]; int log_level = GPOINTER_TO_INT (args[2]);
int log_interval = (int)args[3]; int log_interval = GPOINTER_TO_INT (args[3]);
u_int64_t arg0, arg1; u_int64_t arg0, arg1;
memcpy(&arg0, &args[4], sizeof (arg0)); memcpy(&arg0, &args[4], sizeof (arg0));