Mercurial > hg > nginx
comparison src/core/ngx_conf_file.c @ 290:87e73f067470
nginx-0.0.2-2004-03-16-10:10:12 import
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Tue, 16 Mar 2004 07:10:12 +0000 |
parents | 6468241715e6 |
children | ee394e997c77 |
comparison
equal
deleted
inserted
replaced
289:0750faf8d7e3 | 290:87e73f067470 |
---|---|
279 } | 279 } |
280 | 280 |
281 | 281 |
282 static int ngx_conf_read_token(ngx_conf_t *cf) | 282 static int ngx_conf_read_token(ngx_conf_t *cf) |
283 { | 283 { |
284 char *start, ch, *src, *dst; | 284 u_char *start, ch, *src, *dst; |
285 int len; | 285 int len; |
286 int found, need_space, last_space, sharp_comment; | 286 int found, need_space, last_space, sharp_comment; |
287 int quoted, s_quoted, d_quoted; | 287 int quoted, s_quoted, d_quoted; |
288 ssize_t n; | 288 ssize_t n; |
289 ngx_str_t *word; | 289 ngx_str_t *word; |
512 } | 512 } |
513 | 513 |
514 | 514 |
515 ngx_open_file_t *ngx_conf_open_file(ngx_cycle_t *cycle, ngx_str_t *name) | 515 ngx_open_file_t *ngx_conf_open_file(ngx_cycle_t *cycle, ngx_str_t *name) |
516 { | 516 { |
517 int i; | 517 ngx_uint_t i; |
518 ngx_open_file_t *file; | 518 ngx_open_file_t *file; |
519 | 519 |
520 if (name) { | 520 if (name) { |
521 file = cycle->open_files.elts; | 521 file = cycle->open_files.elts; |
522 for (i = 0; i < cycle->open_files.nelts; i++) { | 522 for (i = 0; i < cycle->open_files.nelts; i++) { |
664 | 664 |
665 char *ngx_conf_set_size_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) | 665 char *ngx_conf_set_size_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) |
666 { | 666 { |
667 char *p = conf; | 667 char *p = conf; |
668 | 668 |
669 ssize_t *sp; | 669 size_t *sp; |
670 ngx_str_t *value; | 670 ngx_str_t *value; |
671 ngx_conf_post_t *post; | 671 ngx_conf_post_t *post; |
672 | 672 |
673 | 673 |
674 sp = (ssize_t *) (p + cmd->offset); | 674 sp = (size_t *) (p + cmd->offset); |
675 if (*sp != NGX_CONF_UNSET) { | 675 if (*sp != NGX_CONF_UNSET_SIZE) { |
676 return "is duplicate"; | 676 return "is duplicate"; |
677 } | 677 } |
678 | 678 |
679 value = (ngx_str_t *) cf->args->elts; | 679 value = (ngx_str_t *) cf->args->elts; |
680 | 680 |
681 *sp = ngx_parse_size(&value[1]); | 681 *sp = ngx_parse_size(&value[1]); |
682 if (*sp == NGX_ERROR) { | 682 if (*sp == (size_t) NGX_ERROR) { |
683 return "invalid value"; | 683 return "invalid value"; |
684 } | 684 } |
685 | 685 |
686 if (cmd->post) { | 686 if (cmd->post) { |
687 post = cmd->post; | 687 post = cmd->post; |
700 ngx_str_t *value; | 700 ngx_str_t *value; |
701 ngx_conf_post_t *post; | 701 ngx_conf_post_t *post; |
702 | 702 |
703 | 703 |
704 msp = (ngx_msec_t *) (p + cmd->offset); | 704 msp = (ngx_msec_t *) (p + cmd->offset); |
705 if (*msp != (ngx_msec_t) NGX_CONF_UNSET) { | 705 if (*msp != NGX_CONF_UNSET_MSEC) { |
706 return "is duplicate"; | 706 return "is duplicate"; |
707 } | 707 } |
708 | 708 |
709 value = (ngx_str_t *) cf->args->elts; | 709 value = (ngx_str_t *) cf->args->elts; |
710 | 710 |
791 | 791 |
792 char *ngx_conf_set_bitmask_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) | 792 char *ngx_conf_set_bitmask_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) |
793 { | 793 { |
794 char *p = conf; | 794 char *p = conf; |
795 | 795 |
796 ngx_int_t *np, i, m; | 796 ngx_uint_t *np, i, m; |
797 ngx_str_t *value; | 797 ngx_str_t *value; |
798 ngx_conf_bitmask_t *mask; | 798 ngx_conf_bitmask_t *mask; |
799 | 799 |
800 | 800 |
801 np = (ngx_int_t *) (p + cmd->offset); | 801 np = (ngx_uint_t *) (p + cmd->offset); |
802 value = (ngx_str_t *) cf->args->elts; | 802 value = (ngx_str_t *) cf->args->elts; |
803 mask = cmd->post; | 803 mask = cmd->post; |
804 | 804 |
805 for (i = 1; i < cf->args->nelts; i++) { | 805 for (i = 1; i < cf->args->nelts; i++) { |
806 for (m = 0; mask[m].name.len != 0; m++) { | 806 for (m = 0; mask[m].name.len != 0; m++) { |