X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Finternet_addressing.c;h=355656ab52d888ee93297c9771a7285ca730a6f7;hp=7914da90668cfeaa359115bbb0f9d07c439dcfb1;hb=83f6f54ff172d43c9ab0fab87b10280d0c99ccec;hpb=45dec175706ba376d19f66d7eeac6f71b87ef810

diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c
index 7914da906..355656ab5 100644
--- a/citadel/internet_addressing.c
+++ b/citadel/internet_addressing.c
@@ -83,12 +83,12 @@ void utf8ify_rfc822_string(char *buf) {
 	char encoding[16];
 	char istr[1024];
 	iconv_t ic = (iconv_t)(-1) ;
-	char *ibuf;			/**< Buffer of characters to be converted */
-	char *obuf;			/**< Buffer for converted characters */
-	size_t ibuflen;			/**< Length of input buffer */
-	size_t obuflen;			/**< Length of output buffer */
-	char *isav;			/**< Saved pointer to input buffer */
-	char *osav;			/**< Saved pointer to output buffer */
+	char *ibuf;			// Buffer of characters to be converted
+	char *obuf;			// Buffer for converted characters
+	size_t ibuflen;			// Length of input buffer
+	size_t obuflen;			// Length of output buffer
+	char *isav;			// Saved pointer to input buffer
+	char *osav;			// Saved pointer to output buffer
 	int passes = 0;
 	int i, len, delta;
 	int illegal_non_rfc2047_encoding = 0;
@@ -103,7 +103,7 @@ void utf8ify_rfc822_string(char *buf) {
 	for (i=0; i<len; ++i) {
 		if ((buf[i] < 32) || (buf[i] > 126)) {
 			illegal_non_rfc2047_encoding = 1;
-			i = len; ///< take a shortcut, it won't be more than one.
+			i = len;	// take a shortcut, it won't be more than one.
 		}
 	}
 	if (illegal_non_rfc2047_encoding) {
@@ -189,10 +189,10 @@ void utf8ify_rfc822_string(char *buf) {
 
 		ibuf = malloc(1024);
 		isav = ibuf;
-		if (!strcasecmp(encoding, "B")) {	/**< base64 */
+		if (!strcasecmp(encoding, "B")) {	// base64
 			ibuflen = CtdlDecodeBase64(ibuf, istr, strlen(istr));
 		}
-		else if (!strcasecmp(encoding, "Q")) {	/**< quoted-printable */
+		else if (!strcasecmp(encoding, "Q")) {	// quoted-printable
 			size_t len;
 			unsigned long pos;
 			
@@ -207,7 +207,7 @@ void utf8ify_rfc822_string(char *buf) {
 			ibuflen = CtdlDecodeQuotedPrintable(ibuf, istr, len);
 		}
 		else {
-			strcpy(ibuf, istr);		/**< unknown encoding */
+			strcpy(ibuf, istr);		// unknown encoding
 			ibuflen = strlen(istr);
 		}
 
@@ -269,7 +269,6 @@ inline void utf8ify_rfc822_string(char *a){};
 #endif
 
 
-
 struct trynamebuf {
 	char buffer1[SIZ];
 	char buffer2[SIZ];
@@ -325,7 +324,6 @@ int CtdlHostAlias(char *fqdn) {
 }
 
 
-
 /*
  * Determine whether a given Internet address belongs to the current user
  */
@@ -379,9 +377,6 @@ void sanitize_truncated_recipient(char *str)
 }
 
 
-
-
-
 /*
  * This function is self explanatory.
  * (What can I say, I'm in a weird mood today...)
@@ -406,7 +401,6 @@ void remove_any_whitespace_to_the_left_or_right_of_at_symbol(char *name)
 
 /*
  * Aliasing for network mail.
- * (Error messages have been commented out, because this is a server.)
  */
 int alias(char *name)
 {				/* process alias and routing info for mail */
@@ -522,7 +516,6 @@ int alias(char *name)
 }
 
 
-
 /*
  * Validate recipients, count delivery types and errors, and handle aliasing
  * FIXME check for dupes!!!!!
@@ -876,8 +869,9 @@ char *qp_encode_email_addrs(char *source)
 	EncodedMaxLen = nColons * (sizeof(headerStr) + 3) + SourceLen * 3;
 	Encoded = (char*) malloc (EncodedMaxLen);
 
-	for (i = 0; i < nColons; i++)
+	for (i = 0; i < nColons; i++) {
 		source[AddrPtr[i]++] = '\0';
+	}
 	/* TODO: if libidn, this might get larger*/
 	user = malloc(SourceLen + 1);
 	node = malloc(SourceLen + 1);
@@ -994,7 +988,6 @@ void unfold_rfc822_field(char **field, char **FieldEnd)
 }
 
 
-
 /*
  * Split an RFC822-style address into userid, host, and full name
  *
@@ -1133,7 +1126,6 @@ void process_rfc822_addr(const char *rfc822, char *user, char *node, char *name)
 }
 
 
-
 /*
  * convert_field() is a helper function for convert_internet_message().
  * Given start/end positions for an rfc822 field, it converts it to a Citadel
@@ -1339,7 +1331,6 @@ struct CtdlMessage *convert_internet_message(char *rfc822) {
 }
 
 
-
 struct CtdlMessage *convert_internet_message_buf(StrBuf **rfc822)
 {
 	struct CtdlMessage *msg;
@@ -1434,7 +1425,6 @@ struct CtdlMessage *convert_internet_message_buf(StrBuf **rfc822)
 }
 
 
-
 /*
  * Look for a particular header field in an RFC822 message text.  If the
  * requested field is found, it is unfolded (if necessary) and returned to
@@ -1486,7 +1476,6 @@ char *rfc822_fetch_field(const char *rfc822, const char *fieldname) {
 }
 
 
-
 /*****************************************************************************
  *                      DIRECTORY MANAGEMENT FUNCTIONS                       *
  *****************************************************************************/