X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=date.c;h=016af4eac6d36a91b485facee50cd257385d2981;hp=0f217e44134b5567cbf401b32c7fdf0a48fd3d93;hb=dbadca9a63ce9e97dc2d80fb0fee7ba2f8640316;hpb=f638fbf8d6c5c3dada648edf974a410c3ca7ace5

diff --git a/date.c b/date.c
index 0f217e44..016af4ea 100644
--- a/date.c
+++ b/date.c
@@ -75,7 +75,7 @@ static unsigned char gmime_datetok_table[256] = {
 	111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,
 };
 
-/* hrm, is there a library for this shit? */
+/* hrm, is there a library for this stuff? */
 static struct {
 	char *name;
 	int offset;
@@ -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;
@@ -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;