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

[citadel.git] / citadel / modules / calendar / serv_calendar.c

diff --git a/citadel/modules/calendar/serv_calendar.c b/citadel/modules/calendar/serv_calendar.c
index de35044412af7d29c44c283cb159b2e309bc9464..ac8d6e9c5431c0ede002bf8ac0885bb5eaefa5fc 100644 (file)
--- a/citadel/modules/calendar/serv_calendar.c
+++ b/citadel/modules/calendar/serv_calendar.c
@@ -1274,7 +1274,7 @@ void ical_freebusy(char *who) {
                strcat(buf, "@");
                strcat(buf, config.c_fqdn);
        }
-       for (i=0; i<strlen(buf); ++i) {
+       for (i=0; !IsEmptyStr(&buf[i]); ++i) {
                if (buf[i]==' ') buf[i] = '_';
        }
        icalcomponent_add_property(fb, icalproperty_new_organizer(buf));
@@ -1955,14 +1955,14 @@ int ical_obj_beforesave(struct CtdlMessage *msg)
                0
        );
 
-       if (strlen(imm.uid) > 0) {
+       if (!IsEmptyStr(imm.uid)) {
                if (msg->cm_fields['E'] != NULL) {
                        free(msg->cm_fields['E']);
                }
                msg->cm_fields['E'] = strdup(imm.uid);
                lprintf(CTDL_DEBUG, "Saving calendar UID <%s>\n", msg->cm_fields['E']);
        }
-       if (strlen(imm.subject) > 0) {
+       if (!IsEmptyStr(imm.subject)) {
                if (msg->cm_fields['U'] != NULL) {
                        free(msg->cm_fields['U']);
                }