Continuing the war against C89-style comments
authorArt Cancro <ajc@citadel.org>
Fri, 5 Jan 2024 19:44:46 +0000 (14:44 -0500)
committerArt Cancro <ajc@citadel.org>
Fri, 5 Jan 2024 19:44:46 +0000 (14:44 -0500)
citadel/server/modules/calendar/serv_calendar.c

index e963b6d6ee33262480430334fe42cf9f04498173..02be85f0ffd15ed7e6e82a93395100c7bbdee6c1 100644 (file)
@@ -1112,9 +1112,7 @@ void ical_hunt_for_conflicts(icalcomponent *cal) {
 }
 
 
-/*
- * Hunt for conflicts (Phase 1 -- retrieve the object and call Phase 2)
- */
+// Hunt for conflicts (Phase 1 -- retrieve the object and call Phase 2)
 void ical_conflicts(long msgnum, char *partnum) {
        struct CtdlMessage *msg = NULL;
        struct ical_respond_data ird;
@@ -1282,14 +1280,11 @@ void ical_add_to_freebusy(icalcomponent *fb, icalcomponent *top_level_cal) {
 }
 
 
-/*
- * Backend for ical_freebusy()
- *
- * This function simply loads the messages in the user's calendar room,
- * which contain VEVENTs, then strips them of all non-freebusy data, and
- * adds them to the supplied VCALENDAR.
- *
- */
+// Backend for ical_freebusy()
+//
+// This function simply loads the messages in the user's calendar room,
+// which contain VEVENTs, then strips them of all non-freebusy data, and
+// adds them to the supplied VCALENDAR.
 void ical_freebusy_backend(long msgnum, void *data) {
        icalcomponent *fb;
        struct CtdlMessage *msg = NULL;
@@ -1473,12 +1468,10 @@ void ical_freebusy(char *who) {
 }
 
 
-/*
- * Backend for ical_getics()
- * 
- * This is a ForEachMessage() callback function that searches the current room
- * for calendar events and adds them each into one big calendar component.
- */
+// Backend for ical_getics()
+// 
+// This is a ForEachMessage() callback function that searches the current room
+// for calendar events and adds them each into one big calendar component.
 void ical_getics_backend(long msgnum, void *data) {
        icalcomponent *encaps, *c;
        struct CtdlMessage *msg = NULL;
@@ -1487,7 +1480,7 @@ void ical_getics_backend(long msgnum, void *data) {
        encaps = (icalcomponent *)data;
        if (encaps == NULL) return;
 
-       /* Look for the calendar event... */
+       // Look for the calendar event...
 
        msg = CtdlFetchMessage(msgnum, 1);
        if (msg == NULL) return;
@@ -1495,38 +1488,35 @@ void ical_getics_backend(long msgnum, void *data) {
        strcpy(ird.desired_partnum, "_HUNT_");
        mime_parser(
                CM_RANGE(msg, eMessageText),
-               *ical_locate_part,              /* callback function */
+               *ical_locate_part,              // callback function
                NULL,
                NULL,
-               (void *) &ird,                  /* user data */
+               (void *) &ird,                  // user data
                0
        );
        CM_Free(msg);
 
        if (ird.cal == NULL) return;
 
-       /* Here we go: put the VEVENT into the VCALENDAR.  We now no longer
-        * are responsible for "the_request"'s memory -- it will be freed
-        * when we free "encaps".
-        */
+       // Here we go: put the VEVENT into the VCALENDAR.  We now no longer
+       // are responsible for "the_request"'s memory -- it will be freed
+       // when we free "encaps".
 
-       /* If the top-level component is *not* a VCALENDAR, we can drop it right
-        * in.  This will almost never happen.
-        */
+       // If the top-level component is *not* a VCALENDAR, we can drop it right in.
+       // This will almost never happen.
        if (icalcomponent_isa(ird.cal) != ICAL_VCALENDAR_COMPONENT) {
                icalcomponent_add_component(encaps, ird.cal);
        }
-       /*
-        * In the more likely event that we're looking at a VCALENDAR with the VEVENT
-        * and other components encapsulated inside, we have to extract them.
-        */
+
+       // In the more likely event that we're looking at a VCALENDAR with the VEVENT
+       // and other components encapsulated inside, we have to extract them.
        else {
-               for (c = icalcomponent_get_first_component(ird.cal, ICAL_ANY_COMPONENT);
+               for     (c = icalcomponent_get_first_component(ird.cal, ICAL_ANY_COMPONENT);
                        (c != NULL);
                        c = icalcomponent_get_next_component(ird.cal, ICAL_ANY_COMPONENT)
                ) {
 
-                       /* For VTIMEZONE components, suppress duplicates of the same tzid */
+                       // For VTIMEZONE components, suppress duplicates of the same tzid
 
                        if (icalcomponent_isa(c) == ICAL_VTIMEZONE_COMPONENT) {
                                icalproperty *p = icalcomponent_get_first_property(c, ICAL_TZID_PROPERTY);
@@ -1539,7 +1529,7 @@ void ical_getics_backend(long msgnum, void *data) {
                                }
                        }
 
-                       /* All other types of components can go in verbatim */
+                       // All other types of components can go in verbatim
                        else {
                                icalcomponent_add_component(encaps, icalcomponent_new_clone(c));
                        }
@@ -1559,7 +1549,7 @@ void ical_getics(void) {
                &&(CC->room.QRdefaultview != VIEW_TASKS)
        ) {
                cprintf("%d Not a calendar room\n", ERROR+NOT_HERE);
-               return;         /* This room does not contain a calendar. */
+               return;         // This room does not contain a calendar.
        }
 
        encaps = icalcomponent_new_vcalendar();
@@ -1571,16 +1561,16 @@ void ical_getics(void) {
 
        cprintf("%d one big calendar\n", LISTING_FOLLOWS);
 
-       /* Set the Product ID */
+       // Set the Product ID
        icalcomponent_add_property(encaps, icalproperty_new_prodid(PRODID));
 
-       /* Set the Version Number */
+       // Set the Version Number
        icalcomponent_add_property(encaps, icalproperty_new_version("2.0"));
 
-       /* Set the method to PUBLISH */
+       // Set the method to PUBLISH
        icalcomponent_set_method(encaps, ICAL_METHOD_PUBLISH);
 
-       /* Now go through the room encapsulating all calendar items. */
+       // Now go through the room encapsulating all calendar items.
        CtdlForEachMessage(MSGS_ALL, 0, NULL,
                NULL,
                NULL,
@@ -1589,7 +1579,7 @@ void ical_getics(void) {
        );
 
        ser = icalcomponent_as_ical_string_r(encaps);
-       icalcomponent_free(encaps);                     /* Don't need this anymore. */
+       icalcomponent_free(encaps);                     // Don't need this anymore.
        client_write(ser, strlen(ser));
        free(ser);
        cprintf("\n000\n");
@@ -1645,33 +1635,29 @@ void ical_putics(void) {
        cal = icalcomponent_new_from_string(calstream);
        free(calstream);
 
-       /* We got our data stream -- now do something with it. */
+       // We got our data stream -- now do something with it.
 
-       /* Delete the existing messages in the room, because we are overwriting
-        * the entire calendar with an entire new (or updated) calendar.
-        * (Careful: this opens an S_ROOMS critical section!)
-        */
+       // Delete the existing messages in the room, because we are overwriting
+       // the entire calendar with an entire new (or updated) calendar.
+       // (Careful: this opens an S_ROOMS critical section!)
        CtdlDeleteMessages(CC->room.QRname, NULL, 0, "");
 
-       /* If the top-level component is *not* a VCALENDAR, we can drop it right
-        * in.  This will almost never happen.
-        */
+       // If the top-level component is *not* a VCALENDAR, we can drop it right in.
+       // This will almost never happen.
        if (icalcomponent_isa(cal) != ICAL_VCALENDAR_COMPONENT) {
                ical_write_to_cal(NULL, cal);
        }
-       /*
-        * In the more likely event that we're looking at a VCALENDAR with the VEVENT
-        * and other components encapsulated inside, we have to extract them.
-        */
+
+       // In the more likely event that we're looking at a VCALENDAR with the VEVENT
+       // and other components encapsulated inside, we have to extract them.
        else {
-               for (c = icalcomponent_get_first_component(cal, ICAL_ANY_COMPONENT);
+               for     (c = icalcomponent_get_first_component(cal, ICAL_ANY_COMPONENT);
                        (c != NULL);
                        c = icalcomponent_get_next_component(cal, ICAL_ANY_COMPONENT)
                ) {
 
-                       /* Non-VTIMEZONE components each get written as individual messages.
-                        * But we also need to attach the relevant VTIMEZONE components to them.
-                        */
+                       // Non-VTIMEZONE components each get written as individual messages.
+                       // But we also need to attach the relevant VTIMEZONE components to them.
                        if (    (icalcomponent_isa(c) != ICAL_VTIMEZONE_COMPONENT)
                                && (encaps = icalcomponent_new_vcalendar())
                        ) {
@@ -1679,7 +1665,7 @@ void ical_putics(void) {
                                icalcomponent_add_property(encaps, icalproperty_new_version("2.0"));
                                icalcomponent_set_method(encaps, ICAL_METHOD_PUBLISH);
 
-                               /* Attach any needed timezones here */
+                               // Attach any needed timezones here
                                tzidlist = NewHash(1, NULL);
                                if (tzidlist) {
                                        icalcomponent_foreach_tzid(c, ical_putics_grabtzids, tzidlist);
@@ -1690,15 +1676,15 @@ void ical_putics(void) {
                                        syslog(LOG_DEBUG, "calendar: attaching timezone '%s'", (char*) Value);
                                        icaltimezone *t = NULL;
 
-                                       /* First look for a timezone attached to the original calendar */
+                                       // First look for a timezone attached to the original calendar
                                        t = icalcomponent_get_timezone(cal, Value);
 
-                                       /* Try built-in tzdata if the right one wasn't attached */
+                                       // Try built-in tzdata if the right one wasn't attached
                                        if (!t) {
                                                t = icaltimezone_get_builtin_timezone(Value);
                                        }
 
-                                       /* I've got a valid timezone to attach. */
+                                       // I've got a valid timezone to attach.
                                        if (t) {
                                                icalcomponent_add_component(encaps,
                                                        icalcomponent_new_clone(
@@ -1711,10 +1697,10 @@ void ical_putics(void) {
                                DeleteHashPos(&HashPos);
                                DeleteHash(&tzidlist);
 
-                               /* Now attach the component itself (usually a VEVENT or VTODO) */
+                               // Now attach the component itself (usually a VEVENT or VTODO)
                                icalcomponent_add_component(encaps, icalcomponent_new_clone(c));
 
-                               /* Write it to the message store */
+                               // Write it to the message store
                                ical_write_to_cal(NULL, encaps);
                                icalcomponent_free(encaps);
                        }
@@ -1725,9 +1711,7 @@ void ical_putics(void) {
 }
 
 
-/*
- * All Citadel calendar commands from the client come through here.
- */
+// All Citadel calendar commands from the client come through here.
 void cmd_ical(char *argbuf) {
        char subcmd[64];
        long msgnum;
@@ -1737,7 +1721,7 @@ void cmd_ical(char *argbuf) {
 
        extract_token(subcmd, argbuf, 0, '|', sizeof subcmd);
 
-       /* Allow "test" and "freebusy" subcommands without logging in. */
+       // Allow "test" and "freebusy" subcommands without logging in.
 
        if (!strcasecmp(subcmd, "test")) {
                cprintf("%d This server supports calendaring\n", CIT_OK);
@@ -1795,34 +1779,32 @@ void cmd_ical(char *argbuf) {
 }
 
 
-/*
- * We don't know if the calendar room exists so we just create it at login
- */
+// We don't know if the calendar room exists so we just create it at login
 void ical_CtdlCreateRoom(void) {
        struct ctdlroom qr;
        struct visit vbuf;
 
-       /* Create the calendar room if it doesn't already exist */
+       // Create the calendar room if it doesn't already exist
        CtdlCreateRoom(USERCALENDARROOM, 4, "", 0, 1, 0, VIEW_CALENDAR);
 
-       /* Set expiration policy to manual; otherwise objects will be lost! */
+       // Set expiration policy to manual; otherwise objects will be lost!
        if (CtdlGetRoomLock(&qr, USERCALENDARROOM)) {
                syslog(LOG_ERR, "calendar: couldn't get the user calendar room");
                return;
        }
        qr.QRep.expire_mode = EXPIRE_MANUAL;
-       qr.QRdefaultview = VIEW_CALENDAR;       /* 3 = calendar view */
+       qr.QRdefaultview = VIEW_CALENDAR;       // 3 = calendar view
        CtdlPutRoomLock(&qr);
 
-       /* Set the view to a calendar view */
+       // Set the view to a calendar view
        CtdlGetRelationship(&vbuf, &CC->user, &qr);
        vbuf.v_view = VIEW_CALENDAR;
        CtdlSetRelationship(&vbuf, &CC->user, &qr);
 
-       /* Create the tasks list room if it doesn't already exist */
+       // Create the tasks list room if it doesn't already exist
        CtdlCreateRoom(USERTASKSROOM, 4, "", 0, 1, 0, VIEW_TASKS);
 
-       /* Set expiration policy to manual; otherwise objects will be lost! */
+       // Set expiration policy to manual; otherwise objects will be lost!
        if (CtdlGetRoomLock(&qr, USERTASKSROOM)) {
                syslog(LOG_ERR, "calendar: couldn't get the user calendar room!");
                return;
@@ -1831,15 +1813,15 @@ void ical_CtdlCreateRoom(void) {
        qr.QRdefaultview = VIEW_TASKS;
        CtdlPutRoomLock(&qr);
 
-       /* Set the view to a task list view */
+       // Set the view to a task list view
        CtdlGetRelationship(&vbuf, &CC->user, &qr);
        vbuf.v_view = VIEW_TASKS;
        CtdlSetRelationship(&vbuf, &CC->user, &qr);
 
-       /* Create the notes room if it doesn't already exist */
+       // Create the notes room if it doesn't already exist
        CtdlCreateRoom(USERNOTESROOM, 4, "", 0, 1, 0, VIEW_NOTES);
 
-       /* Set expiration policy to manual; otherwise objects will be lost! */
+       // Set expiration policy to manual; otherwise objects will be lost!
        if (CtdlGetRoomLock(&qr, USERNOTESROOM)) {
                syslog(LOG_ERR, "calendar: couldn't get the user calendar room!");
                return;
@@ -1848,7 +1830,7 @@ void ical_CtdlCreateRoom(void) {
        qr.QRdefaultview = VIEW_NOTES;
        CtdlPutRoomLock(&qr);
 
-       /* Set the view to a notes view */
+       // Set the view to a notes view
        CtdlGetRelationship(&vbuf, &CC->user, &qr);
        vbuf.v_view = VIEW_NOTES;
        CtdlSetRelationship(&vbuf, &CC->user, &qr);
@@ -1857,14 +1839,12 @@ void ical_CtdlCreateRoom(void) {
 }
 
 
-/*
- * ical_send_out_invitations() is called by ical_saving_vevent() when it finds a VEVENT.
- *
- * top_level_cal is the highest available level calendar object.
- * cal is the subcomponent containing the VEVENT.
- *
- * Note: if you change the encapsulation code here, change it in WebCit's ical_encapsulate_subcomponent()
- */
+// ical_send_out_invitations() is called by ical_saving_vevent() when it finds a VEVENT.
+//
+// top_level_cal is the highest available level calendar object.
+// cal is the subcomponent containing the VEVENT.
+//
+// Note: if you change the encapsulation code here, change it in WebCit's ical_encapsulate_subcomponent()
 void ical_send_out_invitations(icalcomponent *top_level_cal, icalcomponent *cal) {
        icalcomponent *the_request = NULL;
        char *serialized_request = NULL;
@@ -1894,26 +1874,20 @@ void ical_send_out_invitations(icalcomponent *top_level_cal, icalcomponent *cal)
                return;
        }
 
-       /* If this is a VCALENDAR component, look for a VEVENT subcomponent. */
+       // If this is a VCALENDAR component, look for a VEVENT subcomponent.
        if (icalcomponent_isa(cal) == ICAL_VCALENDAR_COMPONENT) {
-               ical_send_out_invitations(top_level_cal,
-                       icalcomponent_get_first_component(
-                               cal, ICAL_VEVENT_COMPONENT
-                       )
-               );
+               ical_send_out_invitations(top_level_cal, icalcomponent_get_first_component(cal, ICAL_VEVENT_COMPONENT));
                return;
        }
 
-       /* Clone the event */
+       // Clone the event
        the_request = icalcomponent_new_clone(cal);
        if (the_request == NULL) {
                syslog(LOG_ERR, "calendar: cannot clone calendar object");
                return;
        }
 
-       /* Extract the summary string -- we'll use it as the
-        * message subject for the request
-        */
+       // Extract the summary string -- we'll use it as the message subject for the request
        strcpy(summary_string, "Meeting request");
        summary = icalcomponent_get_first_property(the_request, ICAL_SUMMARY_PROPERTY);
        if (summary != NULL) {
@@ -1923,14 +1897,14 @@ void ical_send_out_invitations(icalcomponent *top_level_cal, icalcomponent *cal)
                }
        }
 
-       /* Determine who the recipients of this message are (the attendees) */
+       // Determine who the recipients of this message are (the attendees)
        strcpy(attendees_string, "");
        for (attendee = icalcomponent_get_first_property(the_request, ICAL_ATTENDEE_PROPERTY); attendee != NULL; attendee = icalcomponent_get_next_property(the_request, ICAL_ATTENDEE_PROPERTY)) {
                const char *ch = icalproperty_get_attendee(attendee);
                if ((ch != NULL) && !strncasecmp(ch, "MAILTO:", 7)) {
                        safestrncpy(this_attendee, ch + 7, sizeof(this_attendee));
                        
-                       if (!CtdlIsMe(this_attendee, sizeof this_attendee)) {   /* don't send an invitation to myself! */
+                       if (!CtdlIsMe(this_attendee, sizeof this_attendee)) {   // don't send an invitation to myself!
                                snprintf(&attendees_string[strlen(attendees_string)],
                                         sizeof(attendees_string) - strlen(attendees_string),
                                         "%s, ",
@@ -1951,7 +1925,7 @@ void ical_send_out_invitations(icalcomponent *top_level_cal, icalcomponent *cal)
                return;
        }
 
-       /* Encapsulate the VEVENT component into a complete VCALENDAR */
+       // Encapsulate the VEVENT component into a complete VCALENDAR
        encaps = icalcomponent_new_vcalendar();
        if (encaps == NULL) {
                syslog(LOG_ERR, "calendar: could not allocate component!");
@@ -1959,16 +1933,16 @@ void ical_send_out_invitations(icalcomponent *top_level_cal, icalcomponent *cal)
                return;
        }
 
-       /* Set the Product ID */
+       // Set the Product ID
        icalcomponent_add_property(encaps, icalproperty_new_prodid(PRODID));
 
-       /* Set the Version Number */
+       // Set the Version Number
        icalcomponent_add_property(encaps, icalproperty_new_version("2.0"));
 
-       /* Set the method to REQUEST */
+       // Set the method to REQUEST
        icalcomponent_set_method(encaps, ICAL_METHOD_REQUEST);
 
-       /* Look for properties containing timezone parameters, to see if we need to attach VTIMEZONEs */
+       // Look for properties containing timezone parameters, to see if we need to attach VTIMEZONEs
        for (p = icalcomponent_get_first_property(the_request, ICAL_ANY_PROPERTY);
                p != NULL;
                p = icalcomponent_get_next_property(the_request, ICAL_ANY_PROPERTY)
@@ -1989,7 +1963,7 @@ void ical_send_out_invitations(icalcomponent *top_level_cal, icalcomponent *cal)
                ) {
                        t = icalproperty_get_dtstart(p);        // it's safe to use dtstart for all of them
 
-                       /* Determine the tzid in order for some of the conditions below to work */
+                       // Determine the tzid in order for some of the conditions below to work
                        tzidp = icalproperty_get_first_parameter(p, ICAL_TZID_PARAMETER);
                        if (tzidp) {
                                tzidc = icalparameter_get_tzid(tzidp);
@@ -1998,7 +1972,7 @@ void ical_send_out_invitations(icalcomponent *top_level_cal, icalcomponent *cal)
                                tzidc = NULL;
                        }
 
-                       /* First see if there's a timezone attached to the data structure itself */
+                       // First see if there's a timezone attached to the data structure itself
                        if (icaltime_is_utc(t)) {
                                z = icaltimezone_get_utc_timezone();
                        }
@@ -2006,28 +1980,28 @@ void ical_send_out_invitations(icalcomponent *top_level_cal, icalcomponent *cal)
                                z = icaltime_get_timezone(t);
                        }
 
-                       /* If not, try to determine the tzid from the parameter using attached zones */
+                       // If not, try to determine the tzid from the parameter using attached zones
                        if ((!z) && (tzidc)) {
                                z = icalcomponent_get_timezone(top_level_cal, tzidc);
                        }
 
-                       /* Still no good?  Try our internal database */
+                       // Still no good?  Try our internal database
                        if ((!z) && (tzidc)) {
                                z = icaltimezone_get_builtin_timezone_from_tzid(tzidc);
                        }
 
                        if (z) {
-                               /* We have a valid timezone.  Good.  Now we need to attach it. */
+                               // We have a valid timezone.  Good.  Now we need to attach it.
 
                                zone_already_attached = 0;
                                for (i=0; i<5; ++i) {
                                        if (z == attached_zones[i]) {
-                                               /* We've already got this one, no need to attach another. */
+                                               // We've already got this one, no need to attach another.
                                                ++zone_already_attached;
                                        }
                                }
                                if ((!zone_already_attached) && (num_zones_attached < 5)) {
-                                       /* This is a new one, so attach it. */
+                                       // This is a new one, so attach it.
                                        attached_zones[num_zones_attached++] = z;
                                }
 
@@ -2037,22 +2011,21 @@ void ical_send_out_invitations(icalcomponent *top_level_cal, icalcomponent *cal)
                }
        }
 
-       /* Encapsulate any timezones we need */
+       // Encapsulate any timezones we need
        if (num_zones_attached > 0) for (i=0; i<num_zones_attached; ++i) {
                icalcomponent *zc;
                zc = icalcomponent_new_clone(icaltimezone_get_component(attached_zones[i]));
                icalcomponent_add_component(encaps, zc);
        }
 
-       /* Here we go: encapsulate the VEVENT into the VCALENDAR.  We now no longer
-        * are responsible for "the_request"'s memory -- it will be freed
-        * when we free "encaps".
-        */
+       // Here we go: encapsulate the VEVENT into the VCALENDAR.  We now no longer
+       // are responsible for "the_request"'s memory -- it will be freed
+       // when we free "encaps".
        icalcomponent_add_component(encaps, the_request);
 
-       /* Serialize it */
+       // Serialize it
        serialized_request = icalcomponent_as_ical_string_r(encaps);
-       icalcomponent_free(encaps);     /* Don't need this anymore. */
+       icalcomponent_free(encaps);     // Don't need this anymore.
        if (serialized_request == NULL) return;
 
        reqsize = strlen(serialized_request) + SIZ;
@@ -2065,14 +2038,14 @@ void ical_send_out_invitations(icalcomponent *top_level_cal, icalcomponent *cal)
 
                msg = CtdlMakeMessage(
                        &CC->user,
-                       NULL,                   /* No single recipient here */
-                       NULL,                   /* No single recipient here */
+                       NULL,                   // No single recipient here
+                       NULL,                   // No single recipient here
                        CC->room.QRname,
                        0,
                        FMT_RFC822,
                        NULL,
                        NULL,
-                       summary_string,         /* Use summary for subject */
+                       summary_string,         // Use summary for subject
                        NULL,
                        request_message_text,
                        NULL
@@ -2107,12 +2080,12 @@ void ical_saving_vevent(icalcomponent *top_level_cal, icalcomponent *cal) {
 
        syslog(LOG_DEBUG, "calendar: ical_saving_vevent() has been called");
 
-       /* Don't send out invitations unless the client wants us to. */
+       // Don't send out invitations unless the client wants us to.
        if (CIT_ICAL->server_generated_invitations == 0) {
                return;
        }
 
-       /* Don't send out invitations if we've been asked not to. */
+       // Don't send out invitations if we've been asked not to.
        if (CIT_ICAL->avoid_sending_invitations > 0) {
                return;
        }
@@ -2143,12 +2116,12 @@ void ical_saving_vevent(icalcomponent *top_level_cal, icalcomponent *cal) {
                }
        }
 
-       /* If the component has subcomponents, recurse through them. */
-       for (c = icalcomponent_get_first_component(cal, ICAL_ANY_COMPONENT);
+       // If the component has subcomponents, recurse through them.
+       for     (c = icalcomponent_get_first_component(cal, ICAL_ANY_COMPONENT);
                (c != NULL);
                c = icalcomponent_get_next_component(cal, ICAL_ANY_COMPONENT)
        ) {
-               /* Recursively process subcomponent */
+               // Recursively process subcomponent
                ical_saving_vevent(top_level_cal, c);
        }
 
@@ -2173,7 +2146,7 @@ void ical_obj_beforesave_backend(char *name, char *filename, char *partnum,
 
        if (!msg) return;
 
-       /* We're only interested in calendar data. */
+       // We're only interested in calendar data.
        if (    (strcasecmp(cbtype, "text/calendar"))
                && (strcasecmp(cbtype, "application/ics"))
        ) {
@@ -2200,11 +2173,11 @@ void ical_obj_beforesave_backend(char *name, char *filename, char *partnum,
 
                if (cal != NULL) {
 
-                       /* Set the message EUID to the iCalendar UID */
+                       // Set the message EUID to the iCalendar UID
 
                        p = ical_ctdl_get_subprop(cal, ICAL_UID_PROPERTY);
                        if (p == NULL) {
-                               /* If there's no uid we must generate one */
+                               // If there's no uid we must generate one
                                generate_uuid(new_uid);
                                icalcomponent_add_property(cal, icalproperty_new_uid(new_uid));
                                p = ical_ctdl_get_subprop(cal, ICAL_UID_PROPERTY);
@@ -2217,7 +2190,7 @@ void ical_obj_beforesave_backend(char *name, char *filename, char *partnum,
                                }
                        }
 
-                       /* Set the message subject to the iCalendar summary */
+                       // Set the message subject to the iCalendar summary
 
                        p = ical_ctdl_get_subprop(cal, ICAL_SUMMARY_PROPERTY);
                        if (p != NULL) {
@@ -2230,7 +2203,7 @@ void ical_obj_beforesave_backend(char *name, char *filename, char *partnum,
                                }
                        }
 
-                       /* Set the message date/time to the iCalendar start time */
+                       // Set the message date/time to the iCalendar start time
 
                        p = ical_ctdl_get_subprop(cal, ICAL_DTSTART_PROPERTY);
                        if (p != NULL) {
@@ -2258,24 +2231,24 @@ void ical_obj_beforesave_backend(char *name, char *filename, char *partnum,
  * using data found in the iCalendar object.
  */
 int ical_obj_beforesave(struct CtdlMessage *msg, struct recptypes *recp) {
-       /* First determine if this is a calendar or tasks room */
+       // First determine if this is a calendar or tasks room
        if (    (CC->room.QRdefaultview != VIEW_CALENDAR)
                && (CC->room.QRdefaultview != VIEW_TASKS)
        ) {
-               return(0);              /* Not an iCalendar-centric room */
+               return(0);              // Not an iCalendar-centric room
        }
 
-       /* It must be an RFC822 message! */
+       // It must be an RFC822 message!
        if (msg->cm_format_type != 4) {
                syslog(LOG_DEBUG, "calendar: rejecting non-RFC822 message");
-               return(1);              /* You tried to save a non-RFC822 message! */
+               return(1);              // You tried to save a non-RFC822 message!
        }
 
        if (CM_IsEmpty(msg, eMessageText)) {
-               return(1);              /* You tried to save a null message! */
+               return(1);              // You tried to save a null message!
        }
 
-       /* Do all of our lovely back-end parsing */
+       // Do all of our lovely back-end parsing
        mime_parser(
                CM_RANGE(msg, eMessageText),
                *ical_obj_beforesave_backend,
@@ -2298,7 +2271,7 @@ void ical_obj_aftersave_backend(char *name, char *filename, char *partnum,
 {
        icalcomponent *cal;
 
-       /* We're only interested in calendar items here. */
+       // We're only interested in calendar items here.
        if (    (strcasecmp(cbtype, "text/calendar"))
                && (strcasecmp(cbtype, "application/ics"))
        ) {
@@ -2334,10 +2307,10 @@ int ical_obj_aftersave(struct CtdlMessage *msg, struct recptypes *recp) {
         * If this isn't the Calendar> room, no further action is necessary.
         */
 
-       /* First determine if this is our room */
+       // First determine if this is our room
        CtdlMailboxName(roomname, sizeof roomname, &CC->user, USERCALENDARROOM);
        if (strcasecmp(roomname, CC->room.QRname)) {
-               return(0);      /* Not the Calendar room -- don't do anything. */
+               return(0);      // Not the Calendar room -- don't do anything.
        }
 
        // It must be an RFC822 message!