summaryrefslogtreecommitdiff
path: root/src/configparser.y
diff options
context:
space:
mode:
authorMarcus Rückert <darix@opensu.se>2006-10-04 13:26:23 +0000
committerMarcus Rückert <darix@opensu.se>2006-10-04 13:26:23 +0000
commit8cd1471cb3f8951750c62030eb6166cc1ea47f4b (patch)
tree3828ff34c0f6b2a0dfab6cd25e4f74c8ca6582e5 /src/configparser.y
parentfe6b7207d721cb5d74de0ce08a069cd02b78577d (diff)
downloadlighttpd-git-8cd1471cb3f8951750c62030eb6166cc1ea47f4b.tar.gz
- white space cleanup part 2 this time 1.4 ;)
i hope it helps with merging stuff back to 1.5 git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@1371 152afb58-edef-0310-8abb-c4023f1b3aa9
Diffstat (limited to 'src/configparser.y')
-rw-r--r--src/configparser.y34
1 files changed, 17 insertions, 17 deletions
diff --git a/src/configparser.y b/src/configparser.y
index 122f4241..b5bc7853 100644
--- a/src/configparser.y
+++ b/src/configparser.y
@@ -152,7 +152,7 @@ varline ::= key(A) ASSIGN expression(B). {
array_insert_unique(ctx->current->value, B);
B = NULL;
} else {
- fprintf(stderr, "Duplicate config variable in conditional %d %s: %s\n",
+ fprintf(stderr, "Duplicate config variable in conditional %d %s: %s\n",
ctx->current->context_ndx,
ctx->current->key->ptr, B->key->ptr);
ctx->ok = 0;
@@ -288,13 +288,13 @@ aelements(A) ::= aelements(C) COMMA aelement(B). {
array_insert_unique(C, B);
B = NULL;
} else {
- fprintf(stderr, "Duplicate array-key: %s\n",
+ fprintf(stderr, "Duplicate array-key: %s\n",
B->key->ptr);
ctx->ok = 0;
B->free(B);
B = NULL;
}
-
+
A = C;
C = NULL;
}
@@ -318,7 +318,7 @@ aelement(A) ::= stringop(B) ARRAY_ASSIGN expression(C). {
buffer_copy_string_buffer(C->key, B);
buffer_free(B);
B = NULL;
-
+
A = C;
C = NULL;
}
@@ -335,7 +335,7 @@ globalstart ::= GLOBAL. {
global(A) ::= globalstart LCURLY metalines RCURLY. {
data_config *cur;
-
+
cur = ctx->current;
configparser_pop(ctx);
@@ -360,7 +360,7 @@ condlines(A) ::= condline(B). {
condline(A) ::= context LCURLY metalines RCURLY. {
data_config *cur;
-
+
cur = ctx->current;
configparser_pop(ctx);
@@ -404,7 +404,7 @@ context ::= DOLLAR SRVVARNAME(B) LBRACKET stringop(C) RBRACKET cond(E) expressio
buffer_append_string_buffer(b, op);
rvalue = ((data_string*)D)->value;
buffer_append_string_buffer(b, rvalue);
-
+
if (NULL != (dc = (data_config *)array_get_element(ctx->all_configs, b->ptr))) {
configparser_push(ctx, dc, 0);
} else {
@@ -426,7 +426,7 @@ context ::= DOLLAR SRVVARNAME(B) LBRACKET stringop(C) RBRACKET cond(E) expressio
size_t i;
dc = data_config_init();
-
+
buffer_copy_string_buffer(dc->key, b);
buffer_copy_string_buffer(dc->op, op);
buffer_copy_string_buffer(dc->comp_key, B);
@@ -434,7 +434,7 @@ context ::= DOLLAR SRVVARNAME(B) LBRACKET stringop(C) RBRACKET cond(E) expressio
buffer_append_string_buffer(dc->comp_key, C);
buffer_append_string_len(dc->comp_key, CONST_STR_LEN("\"]"));
dc->cond = E;
-
+
for (i = 0; comps[i].comp_key; i ++) {
if (buffer_is_equal_string(
dc->comp_key, comps[i].comp_key, comps[i].len)) {
@@ -457,20 +457,20 @@ context ::= DOLLAR SRVVARNAME(B) LBRACKET stringop(C) RBRACKET cond(E) expressio
#ifdef HAVE_PCRE_H
const char *errptr;
int erroff;
-
- if (NULL == (dc->regex =
+
+ if (NULL == (dc->regex =
pcre_compile(rvalue->ptr, 0, &errptr, &erroff, NULL))) {
dc->string = buffer_init_string(errptr);
dc->cond = CONFIG_COND_UNSET;
- fprintf(stderr, "parsing regex failed: %s -> %s at offset %d\n",
+ fprintf(stderr, "parsing regex failed: %s -> %s at offset %d\n",
rvalue->ptr, errptr, erroff);
ctx->ok = 0;
} else if (NULL == (dc->regex_study =
- pcre_study(dc->regex, 0, &errptr)) &&
+ pcre_study(dc->regex, 0, &errptr)) &&
errptr != NULL) {
- fprintf(stderr, "studying regex failed: %s -> %s\n",
+ fprintf(stderr, "studying regex failed: %s -> %s\n",
rvalue->ptr, errptr);
ctx->ok = 0;
} else {
@@ -478,7 +478,7 @@ context ::= DOLLAR SRVVARNAME(B) LBRACKET stringop(C) RBRACKET cond(E) expressio
}
#else
fprintf(stderr, "can't handle '$%s[%s] =~ ...' as you compiled without pcre support. \n"
- "(perhaps just a missing pcre-devel package ?) \n",
+ "(perhaps just a missing pcre-devel package ?) \n",
B->ptr, C->ptr);
ctx->ok = 0;
#endif
@@ -486,12 +486,12 @@ context ::= DOLLAR SRVVARNAME(B) LBRACKET stringop(C) RBRACKET cond(E) expressio
}
default:
- fprintf(stderr, "unknown condition for $%s[%s]\n",
+ fprintf(stderr, "unknown condition for $%s[%s]\n",
B->ptr, C->ptr);
ctx->ok = 0;
break;
}
-
+
configparser_push(ctx, dc, 1);
}