From 2462097a48a196fa0cc09cb6a1f1fd466f9bf711 Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Thu, 14 Dec 2006 18:18:23 +0000
Subject: [PATCH] Cleaned up some commented-out stuff that was left in various
 files

---
 citadel/ical_dezonify.c | 21 ++++-----------------
 citadel/imap_fetch.c    |  3 +--
 citadel/serv_fulltext.c |  2 --
 citadel/serv_imap.c     |  3 +--
 citadel/serv_smtp.c     |  2 --
 5 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/citadel/ical_dezonify.c b/citadel/ical_dezonify.c
index ec5d86868..a069a0442 100644
--- 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 79be0bedb..bc0aaf41e 100644
--- 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 ab78a7428..cf28dce18 100644
--- 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 452ddefcb..7862a298b 100644
--- 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 54363c9e8..dcad73001 100644
--- 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));
-- 
2.39.2