* strlen holy war: loops. in loops it's very evil. the easy ones go away now.

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

diff --git a/citadel/modules/imap/imap_misc.c b/citadel/modules/imap/imap_misc.c
index 350f9ad108d32c9cb3a23a16e5f6d18bf70b7f72..b51cc7ee1d7f5b42639f7ab203514d10ed37c046 100644 (file)
--- a/citadel/modules/imap/imap_misc.c
+++ b/citadel/modules/imap/imap_misc.c
@@ -258,7 +258,7 @@ void imap_print_instant_messages(void) {
                free(ptr);
                ptr = holdptr;
 
-               for (i=0; i<strlen(dumpomatic); ++i) {
+               for (i=0; !IsEmptyStr(&dumpomatic[i]); ++i) {
                        if (!isprint(dumpomatic[i])) dumpomatic[i] = ' ';
                        if (dumpomatic[i]=='\\') dumpomatic[i]='/';
                        if (dumpomatic[i]=='\"') dumpomatic[i]='\'';
@@ -283,7 +283,7 @@ void imap_do_append_flags(long new_msgnum, char *new_message_flags) {
        int i;
 
        if (new_message_flags == NULL) return;
-       if (strlen(new_message_flags) == 0) return;
+       if (IsEmptyStr(new_message_flags)) return;
 
        safestrncpy(flags, new_message_flags, sizeof flags);