X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=date.c;h=ff1e1a6ac7671f2e88670ea866fd56db6a7af672;hp=f169d6167ecde5260c1575edf5b728eee96527fb;hb=747f610901f979c30dafe22f46e4f0b802c2f901;hpb=9f3649370cefe3d4a28b0df7cb3fea32ded9251a;ds=sidebyside

diff --git a/date.c b/date.c
index f169d616..ff1e1a6a 100644
--- a/date.c
+++ b/date.c
@@ -115,8 +115,8 @@ typedef struct _date_token {
 	size_t len;
 } date_token;
 
-#define date_token_free(tok) g_slice_free (date_token, tok)
-#define date_token_new() g_slice_new (date_token)
+#define date_token_free(tok) free (tok)
+#define date_token_new() malloc (sizeof (date_token))
 
 static date_token *
 datetok (const char *date)
@@ -222,8 +222,9 @@ static int
 get_wday (const char *in, size_t inlen)
 {
 	int wday;
-	
-	g_return_val_if_fail (in != NULL, -1);
+
+	if (in == NULL)
+		return -1;
 	
 	if (inlen < 3)
 		return -1;
@@ -241,7 +242,8 @@ get_mday (const char *in, size_t inlen)
 {
 	int mday;
 	
-	g_return_val_if_fail (in != NULL, -1);
+	if (in == NULL)
+		return -1;
 	
 	mday = decode_int (in, inlen);
 	
@@ -256,7 +258,8 @@ get_month (const char *in, size_t inlen)
 {
 	int i;
 	
-	g_return_val_if_fail (in != NULL, -1);
+	if (in == NULL)
+		return -1;
 	
 	if (inlen < 3)
 		return -1;
@@ -274,7 +277,8 @@ get_year (const char *in, size_t inlen)
 {
 	int year;
 	
-	g_return_val_if_fail (in != NULL, -1);
+	if (in == NULL)
+		return -1;
 	
 	if ((year = decode_int (in, inlen)) == -1)
 		return -1;
@@ -288,7 +292,7 @@ get_year (const char *in, size_t inlen)
 	return year;
 }
 
-static gboolean
+static int
 get_time (const char *in, size_t inlen, int *hour, int *min, int *sec)
 {
 	register const char *inptr;
@@ -359,6 +363,8 @@ get_tzone (date_token **token)
 	return -1;
 }
 
+#define HAVE_TIMEZONE
+
 static time_t
 mktime_utc (struct tm *tm)
 {
@@ -405,7 +411,8 @@ parse_rfc822_date (date_token *tokens, int *tzone)
 	struct tm tm;
 	time_t t;
 	
-	g_return_val_if_fail (tokens != NULL, (time_t) 0);
+	if (tokens == NULL)
+		return 0;
 	
 	token = tokens;
 	
@@ -481,7 +488,7 @@ parse_rfc822_date (date_token *tokens, int *tzone)
 static time_t
 parse_broken_date (date_token *tokens, int *tzone)
 {
-	gboolean got_wday, got_month, got_tzone;
+	int got_wday, got_month, got_tzone;
 	int hour, min, sec, offset, n;
 	date_token *token;
 	struct tm tm;