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

[citadel.git] / citadel / modules / notes / serv_notes.c

diff --git a/citadel/modules/notes/serv_notes.c b/citadel/modules/notes/serv_notes.c
index 47e968b03bd22cfc8ba6b00947e2edda66a9742a..242fa3e5a358cf794e73247a321a7e8cff2194de 100644 (file)
--- a/citadel/modules/notes/serv_notes.c
+++ b/citadel/modules/notes/serv_notes.c
@@ -76,14 +76,15 @@ int serv_notes_beforesave(struct CtdlMessage *msg)
        while (--a > 0) {
                if (!strncasecmp(p, "X-KOrg-Note-Id: ", 16)) {  /* Found it */
                        safestrncpy(uuid, p + 16, sizeof(uuid));
-                       for (i = 0; i<strlen(uuid); ++i) {
+                       for (i = 0; !IsEmptyStr(&uuid[i]); ++i) {
                                if ( (uuid[i] == '\r') || (uuid[i] == '\n') ) {
                                        uuid[i] = 0;
+                                       break;
                                }
                        }
 
                        lprintf(9, "UUID of note is: %s\n", uuid);
-                       if (strlen(uuid) > 0) {
+                       if (!IsEmptyStr(uuid)) {
 
                                if (msg->cm_fields['E'] != NULL) {
                                        free(msg->cm_fields['E']);