* holy war on strlen revived.

diff --git a/webcit/event.c b/webcit/event.c
index 2ece06d1c535ce44219d31a33a889d327e87300b..0ad61af5f55837c5f3da753224cd60c600a31baf 100644 (file)
--- a/webcit/event.c
+++ b/webcit/event.c
@@ -1018,11 +1018,7 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum, char *fr
 
                /* First, strip out the parenthesized partstats.  */
                strcpy(form_attendees, bstr("attendees"));
-               do {
-                       i = strlen(form_attendees);
-                       stripout(form_attendees, '(', ')');
-                       j = strlen(form_attendees);
-               } while (i != j);
+               while ( stripout(form_attendees, '(', ')') != 0);
 
                /* Next, change any commas to newlines, because we want newline-separated attendees. */
                j = strlen(form_attendees);

diff --git a/webcit/webcit.h b/webcit/webcit.h
index 604205bc0f4d19d556b619dd63978626ca4dc8b6..e372480ba89f4f1c4790d17953f6e6b864d8f2ae 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -577,7 +577,6 @@ void escputs1(const char *strbuf, int nbsp, int nolinebreaks);
 void msgesc(char *target, size_t tlen, char *strbuf);
 void msgescputs(char *strbuf);
 void msgescputs1(char *strbuf);
-void stripout(char *str, char leftboundary, char rightboundary);
 void dump_vars(void);
 void embed_main_menu(void);
 void serv_read(char *buf, int bytes);