X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=date.c;h=376d25d241cb7e91e53bd860ec038eca04e65aec;hb=d6102b53c8fcbc45567e48e3db1d1cb8498b0b94;hp=416ea579a3eb1dbc910817413f995556ad115b29;hpb=d9ad59e7636d98daa6131e9fd2cb2b4f5745a853;p=git.git

diff --git a/date.c b/date.c
index 416ea579..376d25d2 100644
--- a/date.c
+++ b/date.c
@@ -123,8 +123,6 @@ static const struct {
 	{ "IDLE", +12, 0, },	/* International Date Line East */
 };
 
-#define NR_TZ (sizeof(timezone_names) / sizeof(timezone_names[0]))
-	
 static int match_string(const char *date, const char *str)
 {
 	int i = 0;
@@ -173,7 +171,7 @@ static int match_alpha(const char *date, struct tm *tm, int *offset)
 		}
 	}
 
-	for (i = 0; i < NR_TZ; i++) {
+	for (i = 0; i < ARRAY_SIZE(timezone_names); i++) {
 		int match = match_string(date, timezone_names[i].name);
 		if (match >= 3) {
 			int off = timezone_names[i].offset;
@@ -257,10 +255,10 @@ static int match_multi_number(unsigned long num, char c, const char *date, char
 				break;
 		}
 		/* mm/dd/yy ? */
-		if (is_date(num3, num2, num, tm))
+		if (is_date(num3, num, num2, tm))
 			break;
 		/* dd/mm/yy ? */
-		if (is_date(num3, num, num2, tm))
+		if (is_date(num3, num2, num, tm))
 			break;
 		return 0;
 	}