2005-04-27 Dan Williams <dcbw@redhat.com>

Patch from Peter Jones:
	* Remove usage of varargs to fix crashes on PPC (RH #154336)

	Patch from Bill Moss:
	* src/NetworkManagerSystem.c
		- Fix checking of return value from ioctl()


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@592 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2005-04-28 02:50:54 +00:00
parent 0219e1746d
commit aac770c185
5 changed files with 144 additions and 105 deletions

View File

@@ -66,7 +66,9 @@ NMDriverSupportLevel nm_get_driver_support_level (LibHalContext *ctx, NMDevice
#define NM_COMPLETION_TRIES_INFINITY -1
typedef gboolean (*nm_completion_func)(int tries, va_list args);
typedef void * nm_completion_args[8];
typedef gboolean (*nm_completion_func)(int tries, nm_completion_args args);
typedef gboolean (*nm_completion_boolean_function_1)(u_int64_t arg);
typedef gboolean (*nm_completion_boolean_function_2)(
u_int64_t arg0, u_int64_t arg1);
@@ -76,7 +78,7 @@ void nm_wait_for_completion(
const guint interval_usecs,
nm_completion_func test_func,
nm_completion_func action_func,
...);
nm_completion_args args);
void nm_wait_for_completion_or_timeout(
const int max_tries,
@@ -84,18 +86,20 @@ void nm_wait_for_completion_or_timeout(
const guint interval_usecs,
nm_completion_func test_func,
nm_completion_func action_func,
...);
nm_completion_args args);
void nm_wait_for_timeout(
const struct timeval *max_time,
const guint interval_usecs,
nm_completion_func test_func,
nm_completion_func action_func,
...);
nm_completion_args args);
gboolean nm_completion_boolean_test(int tries, va_list args);
gboolean nm_completion_boolean_function1_test(int tries, va_list args);
gboolean nm_completion_boolean_function2_test(int tries, va_list args);
gboolean nm_completion_boolean_test(int tries, nm_completion_args args);
gboolean nm_completion_boolean_function1_test(int tries,
nm_completion_args args);
gboolean nm_completion_boolean_function2_test(int tries,
nm_completion_args args);
#define nm_completion_boolean_function_test nm_completion_boolean_function1_test
#endif