date.c: Don't use glib's slice allocator.

[notmuch] / date.c

diff --git a/date.c b/date.c
index f169d6167ecde5260c1575edf5b728eee96527fb..514f84046ab2998fc36dcd4915f8dab69aa3fc32 100644 (file)
--- 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;
@@ -405,7 +409,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 +486,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;