From: Art Cancro <ajc@citadel.org>
Date: Mon, 19 Nov 2007 04:34:42 +0000 (+0000)
Subject: Removed the 'ascmonths' global declaration from libCitadel.
X-Git-Tag: v7.86~2773
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=0174c4b0d4d6f8aeb1e9f8801b2a2ce0e261489c

Removed the 'ascmonths' global declaration from libCitadel.
This should clean up the build on Mac OS.
---

diff --git a/libcitadel/lib/libcitadel.c b/libcitadel/lib/libcitadel.c
index fd64fa99d..8c83bfd9a 100644
--- a/libcitadel/lib/libcitadel.c
+++ b/libcitadel/lib/libcitadel.c
@@ -3,7 +3,6 @@
  *
  */
 
-
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
@@ -15,7 +14,6 @@
 #include <errno.h>
 #include "libcitadel.h"
 
-
 char *libcitadel_version_string(void) {
 	return "$Id$";
 }
diff --git a/libcitadel/lib/mime_parser.c b/libcitadel/lib/mime_parser.c
index 33fc854f7..2b14d7129 100644
--- a/libcitadel/lib/mime_parser.c
+++ b/libcitadel/lib/mime_parser.c
@@ -3,7 +3,7 @@
  *
  * This is the MIME parser for Citadel.
  *
- * Copyright (c) 1998-2007 by Art Cancro
+ * Copyright (c) 1998-2007 by the citadel.org development team.
  * This code is distributed under the GNU General Public License v3.
  *
  */
@@ -20,7 +20,6 @@
 
 #include "libcitadel.h"
 
-
 void extract_key(char *target, char *source, char *key)
 {
 	char *ptr;
diff --git a/libcitadel/lib/tools.c b/libcitadel/lib/tools.c
index 016ec9ab8..ab885268b 100644
--- a/libcitadel/lib/tools.c
+++ b/libcitadel/lib/tools.c
@@ -1,5 +1,6 @@
 /*
- *
+ * A basic toolset containing miscellaneous functions for string manipluation,
+ * encoding/decoding, and a bunch of other stuff.
  */
 
 
@@ -35,12 +36,6 @@ typedef unsigned char byte;	      /* Byte type */
 static byte dtable[256] = "\0";	      /* base64 decode table */
 static byte etable[256] = "\0";	      /* base64 encode table */
 
-/* Month strings for date conversions */
-char *ascmonths[12] = {
-	"Jan", "Feb", "Mar", "Apr", "May", "Jun",
-	"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
-};
-
 char *safestrncpy(char *dest, const char *src, size_t n)
 {
 	int i = 0;
@@ -518,6 +513,11 @@ void fmt_date(char *buf, size_t n, time_t thetime, int seconds) {
 	struct tm tm;
 	int hour;
 
+	/* Month strings for date conversions ... this needs to be localized eventually */
+	char *fmt_date_months[12] = {
+		"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
+	};
+
 	strcpy(buf, "");
 	localtime_r(&thetime, &tm);
 
@@ -527,7 +527,7 @@ void fmt_date(char *buf, size_t n, time_t thetime, int seconds) {
 
 	if (seconds) {
 		snprintf(buf, n, "%s %d %4d %d:%02d:%02d%s",
-			ascmonths[tm.tm_mon],
+			fmt_date_months[tm.tm_mon],
 			tm.tm_mday,
 			tm.tm_year + 1900,
 			hour,
@@ -537,7 +537,7 @@ void fmt_date(char *buf, size_t n, time_t thetime, int seconds) {
 		);
 	} else {
 		snprintf(buf, n, "%s %d %4d %d:%02d%s",
-			ascmonths[tm.tm_mon],
+			fmt_date_months[tm.tm_mon],
 			tm.tm_mday,
 			tm.tm_year + 1900,
 			hour,
@@ -869,7 +869,7 @@ int is_msg_in_mset(char *mset, long msgnum) {
 }
 
 
-/**
+/*
  * \brief searches for a  paternn within asearch string
  * \param search the string to search 
  * \param patn the pattern to find in string
diff --git a/libcitadel/lib/vcard.c b/libcitadel/lib/vcard.c
index f0afd4706..e28f4783d 100644
--- a/libcitadel/lib/vcard.c
+++ b/libcitadel/lib/vcard.c
@@ -3,7 +3,7 @@
  *
  * vCard implementation for Citadel
  *
- * Copyright (C) 1999-2007 by Art Cancro
+ * Copyright (C) 1999-2007 by the citadel.org development team.
  * This code is freely redistributable under the terms of the GNU General
  * Public License.  All other rights reserved.
  */