Cleaned up some commented-out stuff that was left in various files

diff --git a/citadel/ical_dezonify.c b/citadel/ical_dezonify.c
index ec5d868687947016b479c73f68d0f46e70b7a7c9..a069a04428d7adf4ec9b6ce8b56d37dab2aebaba 100644 (file)
--- a/citadel/ical_dezonify.c
+++ b/citadel/ical_dezonify.c
@@ -31,25 +31,11 @@
 /*
  * Figure out which time zone needs to be used for timestamps that are
  * not UTC and do not have a time zone specified.
- *
- * FIXME - most sites are not in New York :)
  */
-icaltimezone *get_default_icaltimezone(void) {
-
+icaltimezone *get_default_icaltimezone(void)
+{
         icaltimezone *zone = NULL;
 
-/*
-   This doesn't even belong here. 
-   I'm just keeping it here until I put it somewhere permanent.
-
-       icalarray *zones;
-       int i;
-       zones = icaltimezone_get_builtin_timezones();
-       for (i = 0; i < zones->num_elements; i++) {
-               lprintf(CTDL_DEBUG, "%s\n", icaltimezone_get_location(icalarray_element_at(zones, i)));
-       }
- */
-
        if (!zone) {
                 zone = icaltimezone_get_builtin_timezone(config.c_default_cal_zone);
        }
@@ -69,7 +55,8 @@ icaltimezone *get_default_icaltimezone(void) {
  */
 void ical_dezonify_backend(icalcomponent *cal,
                        icalcomponent *rcal,
-                       icalproperty *prop) {
+                       icalproperty *prop)
+{
 
        icaltimezone *t = NULL;
        icalparameter *param;

diff --git a/citadel/imap_fetch.c b/citadel/imap_fetch.c
index 79be0bedb81a41c23fd104eb3c87dec9e5efaccd..bc0aaf41ec59e185cfb97ec811ee7ac7aca60beb 100644 (file)
--- a/citadel/imap_fetch.c
+++ b/citadel/imap_fetch.c
@@ -252,8 +252,7 @@ void imap_fetch_rfc822(long msgnum, char *whichfmt) {
 /*
  * Load a specific part of a message into the temp file to be output to a
  * client.  FIXME we can handle parts like "2" and "2.1" and even "2.MIME"
- * but we still can't handle "2.HEADER" (which might not be a problem, because
- * we currently don't have the ability to break out nested RFC822's anyway).
+ * but we still can't handle "2.HEADER" (which might not be a problem).
  *
  * Note: mime_parser() was called with dont_decode set to 1, so we have the
  * luxury of simply spewing without having to re-encode.

diff --git a/citadel/serv_fulltext.c b/citadel/serv_fulltext.c
index ab78a7428c2ac08b40b5de6eb8c3ace0aea8baaf..cf28dce181a116c7f60d062f09eacdece70bde14 100644 (file)
--- a/citadel/serv_fulltext.c
+++ b/citadel/serv_fulltext.c
@@ -175,8 +175,6 @@ void ft_index_message(long msgnum, int op) {
                        else {
                                lprintf(CTDL_ALERT, "Invalid token %d !!\n", tok);
                        }
-
-                       /* FIXME do we need to unlock the file here? */
                }
 
                free(tokens);

diff --git a/citadel/serv_imap.c b/citadel/serv_imap.c
index 452ddefcb84dc7b0a8ef7689a28878bdca9258ea..7862a298bb70d5a41bab7ae1e0b952b09b8f502e 100644 (file)
--- a/citadel/serv_imap.c
+++ b/citadel/serv_imap.c
@@ -1374,8 +1374,7 @@ void imap_rename(int num_parms, char *parms[])
                                           irl->irl_newfloor);
                        if (r != crr_ok) {
                                /* FIXME handle error returns better */
-                               lprintf(CTDL_ERR, "CtdlRenameRoom() error %d\n",
-                                       r);
+                               lprintf(CTDL_ERR, "CtdlRenameRoom() error %d\n", r);
                        }
                        irlp = irl;
                        irl = irl->next;

diff --git a/citadel/serv_smtp.c b/citadel/serv_smtp.c
index 54363c9e84d2f413ccdfaa4c1d8519804c10d415..dcad730017c511ce8754e566415699a93bfa1041 100644 (file)
--- a/citadel/serv_smtp.c
+++ b/citadel/serv_smtp.c
@@ -1079,8 +1079,6 @@ void smtp_try(const char *key, const char *addr, int *status,
                if (!mx_port[0]) {
                        strcpy(mx_port, "25");
                }
-               /* lprintf(CTDL_DEBUG, "FIXME user<%s> pass<%s> host<%s> port<%s>\n",
-                       mx_user, mx_pass, mx_host, mx_port); */
                lprintf(CTDL_DEBUG, "Trying %s : %s ...\n", mx_host, mx_port);
                sock = sock_connect(mx_host, mx_port, "tcp");
                snprintf(dsn, SIZ, "Could not connect: %s", strerror(errno));