dbus/mono Arguments.cs,1.4,1.5

[Owen Fraser-Green]

Update of /cvs/dbus/dbus/mono
In directory pdx:/tmp/cvs-serv22879

Modified Files:
	Arguments.cs 
Log Message:
Handle empty iterators properly!


Index: Arguments.cs
===================================================================
RCS file: /cvs/dbus/dbus/mono/Arguments.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- a/Arguments.cs	1 May 2004 19:56:27 -0000	1.4
+++ b/Arguments.cs	1 May 2004 19:59:58 -0000	1.5
@@ -181,9 +181,9 @@
       string key = "";
 
       // Iterate through the parameters getting the type codes to a string
-      bool empty = dbus_message_iter_init(message.RawMessage, iter);
+      bool notEmpty = dbus_message_iter_init(message.RawMessage, iter);
 
-      if (!empty) {
+      if (notEmpty) {
 	do {
 	  char code = (char) dbus_message_iter_get_arg_type(iter);
 	  if (code == '\0')
@@ -221,7 +221,7 @@
     {
       private Arguments arguments;
       private bool started = false;
-      private bool empty = false;
+      private bool notEmpty = false;
       private IntPtr iter = Marshal.AllocCoTaskMem(Arguments.DBusMessageIterSize);
       
       public ArgumentsEnumerator(Arguments arguments)
@@ -241,13 +241,13 @@
 	  return dbus_message_iter_next(iter);
 	} else {
 	  started = true;
-	  return !empty;
+	  return notEmpty;
 	}
       }
       
       public void Reset()
       {
-	empty = dbus_message_iter_init(arguments.message.RawMessage, iter);
+	notEmpty = dbus_message_iter_init(arguments.message.RawMessage, iter);
 	started = false;
       }