* init some numbers.

[citadel.git] / citadel / modules / imap / imap_list.c

diff --git a/citadel/modules/imap/imap_list.c b/citadel/modules/imap/imap_list.c
index 4c78076cf45fc93abb5cc0e2069eca5f1fb0483c..87ff5854921dbf3ac9da229be2fd59e8431b0c6b 100644 (file)
--- a/citadel/modules/imap/imap_list.c
+++ b/citadel/modules/imap/imap_list.c
@@ -105,9 +105,9 @@ void imap_listroom(struct ctdlroom *qrbuf, void *data)
        int subscribed_rooms_only;
        int num_patterns;
        char **patterns;
-       int return_subscribed;
-       int return_children;
-       int return_metadata;
+       int return_subscribed = 0;
+       int return_children = 0;
+       int return_metadata = 0;
        int i = 0;
        int match = 0;
 
@@ -250,7 +250,7 @@ void imap_list(int num_parms, char *parms[])
                selection_left = 2;
                paren_nest = 0;
                for (i=2; i<num_parms; ++i) {
-                       for (j=0; !IsEmptyStr(&parms[i][j]); ++j) {
+                       for (j=0; parms[i][j]; ++j) {
                                if (parms[i][j] == '(') ++paren_nest;
                                if (parms[i][j] == ')') --paren_nest;
                        }
@@ -314,7 +314,7 @@ void imap_list(int num_parms, char *parms[])
                extended_list_in_use = 1;
                paren_nest = 0;
                for (i=patterns_left; i<num_parms; ++i) {
-                       for (j=0; !IsEmptyStr(&parms[i][j]); ++j) {
+                       for (j=0; &parms[i][j]; ++j) {
                                if (parms[i][j] == '(') ++paren_nest;
                                if (parms[i][j] == ')') --paren_nest;
                        }
@@ -351,7 +351,7 @@ void imap_list(int num_parms, char *parms[])
                extended_list_in_use = 1;
                paren_nest = 0;
                for (i=return_left; i<num_parms; ++i) {
-                       for (j=0; !IsEmptyStr(&parms[i][j]); ++j) {
+                       for (j=0; parms[i][j]; ++j) {
                                if (parms[i][j] == '(') ++paren_nest;
                                if (parms[i][j] == ')') --paren_nest;
                        }