externarray_of_arrays

7 files changed, 25 insertions, 23 deletions

diff --git a/auto/sources b/auto/sources
index f4a7170a..832c815b 100644
--- a/auto/sources
+++ b/auto/sources
@@ -5,6 +5,7 @@
 
 NXT_LIB_SRCS=" \
     src/nxt_lib.c \
+    src/nxt_calendar.c \
     src/nxt_gmtime.c \
     src/nxt_errno.c \
     src/nxt_time.c \
diff --git a/src/nxt_calendar.c b/src/nxt_calendar.c
new file mode 100644
index 00000000..f69d2038
--- /dev/null
+++ b/src/nxt_calendar.c
@@ -0,0 +1,8 @@
+
+#include <nxt_main.h>
+
+
+const char  nxt_wday[][4] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" };
+
+const char  nxt_month[][4] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun",
+                               "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
diff --git a/src/nxt_calendar.h b/src/nxt_calendar.h
new file mode 100644
index 00000000..de5d6fda
--- /dev/null
+++ b/src/nxt_calendar.h
@@ -0,0 +1,10 @@
+
+#ifndef _NXT_CALENDAR_H_INCLUDED_
+#define _NXT_CALENDAR_H_INCLUDED_
+
+
+extern const char  nxt_wday[][4];
+extern const char  nxt_month[][4];
+
+
+#endif  /* _NXT_HTTP_H_INCLUDED_ */
diff --git a/src/nxt_controller.c b/src/nxt_controller.c
index 657988d7..1c3fd487 100644
--- a/src/nxt_controller.c
+++ b/src/nxt_controller.c
@@ -2651,15 +2651,8 @@ static u_char *
 nxt_controller_date(u_char *buf, nxt_realtime_t *now, struct tm *tm,
     size_t size, const char *format)
 {
-    static const char  week[][4] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri",
-                                    "Sat" };
-
-    static const char  month[][4] = { "Jan", "Feb", "Mar", "Apr",
-                                      "May", "Jun", "Jul", "Aug",
-                                      "Sep", "Oct", "Nov", "Dec" };
-
     return nxt_sprintf(buf, buf + size, format,
-                       week[tm->tm_wday], tm->tm_mday,
-                       month[tm->tm_mon], tm->tm_year + 1900,
+                       nxt_wday[tm->tm_wday], tm->tm_mday,
+                       nxt_month[tm->tm_mon], tm->tm_year + 1900,
                        tm->tm_hour, tm->tm_min, tm->tm_sec);
 }
diff --git a/src/nxt_http.h b/src/nxt_http.h
index d77a6165..dcb73c73 100644
--- a/src/nxt_http.h
+++ b/src/nxt_http.h
@@ -300,17 +300,10 @@ struct nxt_http_forward_s {
 nxt_inline u_char *
 nxt_http_date(u_char *buf, struct tm *tm)
 {
-    static const char  week[][4] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri",
-                                     "Sat" };
-
-    static const char  month[][4] = { "Jan", "Feb", "Mar", "Apr",
-                                      "May", "Jun", "Jul", "Aug",
-                                      "Sep", "Oct", "Nov", "Dec" };
-
     return nxt_sprintf(buf, buf + NXT_HTTP_DATE_LEN,
                        "%s, %02d %s %4d %02d:%02d:%02d GMT",
-                       week[tm->tm_wday], tm->tm_mday,
-                       month[tm->tm_mon], tm->tm_year + 1900,
+                       nxt_wday[tm->tm_wday], tm->tm_mday,
+                       nxt_month[tm->tm_mon], tm->tm_year + 1900,
                        tm->tm_hour, tm->tm_min, tm->tm_sec);
 }
 
diff --git a/src/nxt_http_variables.c b/src/nxt_http_variables.c
index 6e584d28..5d5b2a31 100644
--- a/src/nxt_http_variables.c
+++ b/src/nxt_http_variables.c
@@ -265,10 +265,6 @@ nxt_http_log_date(u_char *buf, nxt_realtime_t *now, struct tm *tm,
     u_char  sign;
     time_t  gmtoff;
 
-    static const char  month[][4] = { "Jan", "Feb", "Mar", "Apr",
-                                      "May", "Jun", "Jul", "Aug",
-                                      "Sep", "Oct", "Nov", "Dec" };
-
     gmtoff = nxt_timezone(tm) / 60;
 
     if (gmtoff < 0) {
@@ -280,7 +276,7 @@ nxt_http_log_date(u_char *buf, nxt_realtime_t *now, struct tm *tm,
     }
 
     return nxt_sprintf(buf, buf + size, format,
-                       tm->tm_mday, month[tm->tm_mon], tm->tm_year + 1900,
+                       tm->tm_mday, nxt_month[tm->tm_mon], tm->tm_year + 1900,
                        tm->tm_hour, tm->tm_min, tm->tm_sec,
                        sign, gmtoff / 60, gmtoff % 60);
 }
diff --git a/src/nxt_main.h b/src/nxt_main.h
index a7e0c283..bfe74e3d 100644
--- a/src/nxt_main.h
+++ b/src/nxt_main.h
@@ -29,6 +29,7 @@ typedef struct nxt_thread_pool_s     nxt_thread_pool_t;
 
 typedef void (*nxt_work_handler_t)(nxt_task_t *task, void *obj, void *data);
 
+#include <nxt_calendar.h>
 #include <nxt_unix.h>
 #include <nxt_clang.h>
 #include <nxt_types.h>