* serv_calendar.c: simplified one of the conditionals and eliminated a 'should never...

[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 fe97f7812106963913a7d635d06baadbd8a147c1..42914915cb2d08fe35e95f1afeb68e3a53a7c984 100644 (file)
--- 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);
 }