diff options
| author | Owen Fraser-Green <owen@discobabe.net> | 2004-05-01 19:59:58 +0000 |
|---|---|---|
| committer | John Palmieri <johnp@remedyz.boston.redhat.com> | 2006-06-28 08:15:36 -0400 |
| commit | 2cad5039902545ff72354ee1284058b300738a6b (patch) | |
| tree | 9f2008b27b239eaade29215e0937e32c12327587 | |
| parent | 4019edb70ac0f4c1481fc3b15a2404de4618d5c0 (diff) | |
Handle empty iterators properly!
| -rw-r--r-- | mono/Arguments.cs | 10 | ||||
| -rw-r--r-- | mono/DBusType/Array.cs | 4 | ||||
| -rw-r--r-- | mono/DBusType/Dict.cs | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/mono/Arguments.cs b/mono/Arguments.cs index cdd4b84..f2278bd 100644 --- a/mono/Arguments.cs +++ b/mono/Arguments.cs @@ -181,9 +181,9 @@ namespace DBus 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 @@ namespace DBus {
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 @@ namespace DBus 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;
}
diff --git a/mono/DBusType/Array.cs b/mono/DBusType/Array.cs index b755d05..55f79c8 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 6d0945b..da2103d 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);
|