From f8d951444991ddc63a10229ab2c29bbf1ac3cc8c Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Sat, 27 Dec 2008 04:45:14 +0000 Subject: [PATCH] * serv_calendar.c: simplified one of the conditionals and eliminated a 'should never get here' section --- citadel/modules/calendar/serv_calendar.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/citadel/modules/calendar/serv_calendar.c b/citadel/modules/calendar/serv_calendar.c index fe97f7812..42914915c 100644 --- a/citadel/modules/calendar/serv_calendar.c +++ b/citadel/modules/calendar/serv_calendar.c @@ -1136,7 +1136,7 @@ void ical_conflicts(long msgnum, char *partnum) { msg = CtdlFetchMessage(msgnum, 1); if (msg == NULL) { - cprintf("%d Message %ld not found.\n", + cprintf("%d Message %ld not found\n", ERROR + ILLEGAL_VALUE, (long)msgnum ); @@ -1160,12 +1160,8 @@ void ical_conflicts(long msgnum, char *partnum) { icalcomponent_free(ird.cal); return; } - else { - cprintf("%d No calendar object found\n", ERROR + ROOM_NOT_FOUND); - return; - } - /* should never get here */ + cprintf("%d No calendar object found\n", ERROR + ROOM_NOT_FOUND); } -- 2.30.2