aboutsummaryrefslogtreecommitdiffhomepage
path: root/date.c
diff options
context:
space:
mode:
authorGravatar Carl Worth <cworth@cworth.org>2009-10-19 13:09:19 -0700
committerGravatar Carl Worth <cworth@cworth.org>2009-10-19 13:09:19 -0700
commitdbadca9a63ce9e97dc2d80fb0fee7ba2f8640316 (patch)
treee35734ce30bc04aba8dc6e75218314c8f9ae8fa5 /date.c
parent9f3649370cefe3d4a28b0df7cb3fea32ded9251a (diff)
date.c: Remove all occurrences of g_return_val_if_fail
That's got to be one of the hardest macro names to read, ever, (it's phrased with an implicit negative in the condition, rather than something simple like "assert"). Plus, it's evil, since it's a macro with a return in it. And finally, it's actually *longer* than just typing "if" and "return". So what's the point of this ugly idiom?
Diffstat (limited to 'date.c')
-rw-r--r--date.c17
1 files changed, 11 insertions, 6 deletions
diff --git a/date.c b/date.c
index f169d616..016af4ea 100644
--- a/date.c
+++ b/date.c
@@ -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;