From 3c6ef3df279344d3645009700f7a9c571f037bd2 Mon Sep 17 00:00:00 2001
From: Owen Fraser-Green <owen@discobabe.net>
Date: Sat, 1 May 2004 19:59:58 +0000
Subject: Handle empty iterators properly!

---
 mono/DBusType/Array.cs | 4 ++--
 mono/DBusType/Dict.cs  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'mono/DBusType')

diff --git a/mono/DBusType/Array.cs b/mono/DBusType/Array.cs
index 917fa780..bf41763c 100644
--- a/mono/DBusType/Array.cs
+++ b/mono/DBusType/Array.cs
@@ -36,12 +36,12 @@ namespace DBus.DBusType
       IntPtr arrayIter = Marshal.AllocCoTaskMem(Arguments.DBusMessageIterSize);
       
       int elementTypeCode;
-      bool empty = dbus_message_iter_init_array_iterator(iter, arrayIter, out elementTypeCode);
+      bool notEmpty = dbus_message_iter_init_array_iterator(iter, arrayIter, out elementTypeCode);
       this.elementType = (Type) Arguments.DBusTypes[(char) elementTypeCode];
 
       elements = new ArrayList();
 
-      if (!empty) {
+      if (notEmpty) {
 	do {
 	  object [] pars = new Object[2];
 	  pars[0] = arrayIter;
diff --git a/mono/DBusType/Dict.cs b/mono/DBusType/Dict.cs
index e93d7d77..f5c76b4c 100644
--- a/mono/DBusType/Dict.cs
+++ b/mono/DBusType/Dict.cs
@@ -31,11 +31,11 @@ namespace DBus.DBusType
     {
       IntPtr dictIter = Marshal.AllocCoTaskMem(Arguments.DBusMessageIterSize);
       
-      bool empty = dbus_message_iter_init_dict_iterator(iter, dictIter);
+      bool notEmpty = dbus_message_iter_init_dict_iterator(iter, dictIter);
 
       this.val = new Hashtable();
 
-      if (!empty) {
+      if (notEmpty) {
 	do {
 	  string key = dbus_message_iter_get_dict_key(dictIter);
 	  
-- 
cgit