commit 6ddfbf06625eca15ddf24ac95b755cdc9db32bfa
author Igor Sysoev <igor@sysoev.ru> Thu May 15 15:42:53 2003 +0000
committer Igor Sysoev <igor@sysoev.ru> Thu May 15 15:42:53 2003 +0000
tree fdf4cccdd271b3fce401cff82c911aeb2a390703
parent 79a804880ee362a1256e6e8aeadb73f7f5cf0885

nginx-0.0.1-2003-05-15-19:42:53 import

src/core/ngx_conf_file.c

diff --git a/src/core/ngx_conf_file.c b/src/core/ngx_conf_file.c
index b8bbc52..5e1f173 100644
--- a/src/core/ngx_conf_file.c
+++ b/src/core/ngx_conf_file.c
@@ -85,8 +85,8 @@
 
             } else {
                 ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
-                             "%s %s in %s:%d",
-                             name->data, rv,
+                             "%s in %s:%d",
+                             rv,
                              cf->conf_file->file.name.data,
                              cf->conf_file->line);
                 return NGX_CONF_ERROR;
@@ -493,8 +493,8 @@
 
 char *ngx_conf_set_msec_slot(ngx_conf_t *cf, ngx_command_t *cmd, char *conf)
 {
-    int         size, total, len, scale, i;
-    u_int       max;
+    int         size, total, len, scale;
+    u_int       max, i;
     char        last, *start;
     ngx_str_t  *value;
 
@@ -584,8 +584,8 @@
 
 char *ngx_conf_set_sec_slot(ngx_conf_t *cf, ngx_command_t *cmd, char *conf)
 {
-    int         size, total, len, scale, i;
-    u_int       max;
+    int         size, total, len, scale;
+    u_int       max, i;
     char        last, *start;
     ngx_str_t  *value;
 

src/core/ngx_conf_file.h

diff --git a/src/core/ngx_conf_file.h b/src/core/ngx_conf_file.h
index cc25dea..195424f 100644
--- a/src/core/ngx_conf_file.h
+++ b/src/core/ngx_conf_file.h
@@ -6,6 +6,7 @@
 #include <ngx_files.h>
 #include <ngx_log.h>
 #include <ngx_file.h>
+#include <ngx_time.h>
 #include <ngx_string.h>
 #include <ngx_alloc.h>
 #include <ngx_hunk.h>
@@ -13,20 +14,21 @@
 
 
 /*
- *      AAAA  number of agruments
- *    TT      command flags
- *  LL        command location
+ *        AAAA  number of agruments
+ *      FF      command flags
+ *    TT        command type, i.e. HTTP "location" or "server" command
+ *  00
  */
 
-#define NGX_CONF_NOARGS      1
-#define NGX_CONF_TAKE1       2
-#define NGX_CONF_TAKE2       4
-#define NGX_CONF_ARGS_NUMBER 0x00ffff
-#define NGX_CONF_ANY         0x010000
-#define NGX_CONF_BLOCK       0x020000
-#define NGX_CONF_FLAG        0x040000
+#define NGX_CONF_NOARGS      0x0000000001
+#define NGX_CONF_TAKE1       0x0000000002
+#define NGX_CONF_TAKE2       0x0000000004
+#define NGX_CONF_ARGS_NUMBER 0x000000ffff
+#define NGX_CONF_ANY         0x0000010000
+#define NGX_CONF_BLOCK       0x0000020000
+#define NGX_CONF_FLAG        0x0000040000
 
-#define NGX_MAIN_CONF        0x1000000
+#define NGX_MAIN_CONF        0x0001000000
 
 
 
@@ -101,8 +103,8 @@
     }
 
 #define ngx_conf_msec_merge(conf, prev, default)                             \
-    if (conf == NGX_CONF_UNSET) {                                            \
-        conf = (prev == NGX_CONF_UNSET) ? default : prev;                    \
+    if (conf == (ngx_msec_t) NGX_CONF_UNSET) {                               \
+        conf = (prev == (ngx_msec_t) NGX_CONF_UNSET) ? default : prev;       \
     }
 
 #define ngx_conf_size_merge(conf, prev, default)                             \