embedaddon/lighttpd/src/configparser.c - diff

Return to configparser.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / lighttpd / src

Diff for /embedaddon/lighttpd/src/configparser.c between versions 1.1.1.1 and 1.1.1.2.2.1

version 1.1.1.1, 2013/10/14 10:32:47	version 1.1.1.2.2.1, 2014/06/15 20:22:25
Line 4	Line 4
/* First off, code is include which follows the "include" declaration	/* First off, code is include which follows the "include" declaration
** in the input file. */	** in the input file. */
#include <stdio.h>	#include <stdio.h>
#line 5 "../../src/configparser.y"	#line 5 "./configparser.y"

#include "configfile.h"	#include "configfile.h"
#include "buffer.h"	#include "buffer.h"
Line 17	Line 17
static void configparser_push(config_t ctx, data_config dc, int isnew) {	static void configparser_push(config_t ctx, data_config dc, int isnew) {
if (isnew) {	if (isnew) {
dc->context_ndx = ctx->all_configs->used;	dc->context_ndx = ctx->all_configs->used;
assert(dc->context_ndx > ctx->current->context_ndx);	force_assert(dc->context_ndx > ctx->current->context_ndx);
array_insert_unique(ctx->all_configs, (data_unset *)dc);	array_insert_unique(ctx->all_configs, (data_unset *)dc);
dc->parent = ctx->current;	dc->parent = ctx->current;
array_insert_unique(dc->parent->childs, (data_unset *)dc);	array_insert_unique(dc->parent->childs, (data_unset *)dc);
Line 99 data_unset configparser_merge_data(data_unset op1, c	Line 99 data_unset configparser_merge_data(data_unset op1, c
}	}
break;	break;
default:	default:
assert(0);	force_assert(0);
break;	break;
}	}
}	}
Line 231 typedef union {	Line 231 typedef union {
** yy_default[] Default action for each state.	** yy_default[] Default action for each state.
*/	*/
static YYACTIONTYPE yy_action[] = {	static YYACTIONTYPE yy_action[] = {
/* 0 */ 2, 3, 4, 5, 13, 14, 63, 15, 7, 45,	/* 0 */ 2, 3, 4, 5, 13, 14, 104, 1, 21, 45,
/* 10 */ 20, 88, 16, 46, 28, 49, 41, 10, 40, 25,	/* 10 */ 17, 38, 16, 25, 22, 19, 41, 10, 28, 27,
/* 20 */ 22, 50, 46, 8, 15, 104, 1, 20, 28, 18,	/* 20 */ 37, 100, 30, 25, 22, 34, 15, 28, 18, 20,
/* 30 */ 58, 60, 6, 25, 22, 40, 47, 62, 11, 46,	/* 30 */ 52, 15, 25, 22, 20, 9, 11, 40, 19, 62,
/* 40 */ 20, 9, 23, 24, 26, 29, 89, 58, 60, 10,	/* 40 */ 7, 46, 40, 10, 44, 48, 46, 63, 15, 58,
/* 50 */ 17, 38, 28, 27, 37, 19, 30, 25, 22, 34,	/* 50 */ 60, 20, 28, 53, 58, 60, 51, 25, 22, 40,
/* 60 */ 15, 100, 20, 20, 23, 24, 26, 12, 19, 31,	/* 60 */ 88, 28, 49, 46, 28, 39, 25, 22, 50, 25,
/* 70 */ 32, 40, 19, 44, 43, 46, 95, 35, 90, 89,	/* 70 */ 22, 58, 60, 28, 27, 33, 19, 12, 25, 22,
/* 80 */ 28, 49, 42, 58, 60, 25, 22, 59, 28, 27,	/* 80 */ 34, 31, 32, 20, 95, 23, 24, 26, 29, 35,
/* 90 */ 33, 48, 52, 25, 22, 34, 28, 49, 51, 28,	/* 90 */ 28, 49, 47, 43, 42, 25, 22, 59, 28, 49,
/* 100 */ 36, 25, 22, 61, 25, 22, 89, 28, 39, 89,	/* 100 */ 6, 28, 36, 25, 22, 61, 25, 22, 20, 46,
/* 110 */ 89, 89, 25, 22, 54, 55, 56, 57, 89, 28,	/* 110 */ 23, 24, 26, 90, 89, 89, 54, 55, 56, 57,
/* 120 */ 53, 21, 89, 89, 25, 22, 25, 22,	/* 120 */ 8,
};	};
static YYCODETYPE yy_lookahead[] = {	static YYCODETYPE yy_lookahead[] = {
/* 0 */ 29, 30, 31, 32, 33, 34, 0, 1, 44, 38,	/* 0 */ 29, 30, 31, 32, 33, 34, 27, 28, 35, 38,
/* 10 */ 4, 15, 41, 16, 35, 36, 45, 46, 12, 40,	/* 10 */ 2, 3, 41, 40, 41, 5, 45, 46, 35, 36,
/* 20 */ 41, 42, 16, 15, 1, 27, 28, 4, 35, 36,	/* 20 */ 37, 11, 39, 40, 41, 42, 1, 35, 36, 4,
/* 30 */ 24, 25, 1, 40, 41, 12, 17, 14, 13, 16,	/* 30 */ 43, 1, 40, 41, 4, 38, 13, 12, 5, 14,
/* 40 */ 4, 38, 6, 7, 8, 9, 15, 24, 25, 46,	/* 40 */ 44, 16, 12, 46, 14, 18, 16, 0, 1, 24,
/* 50 */ 2, 3, 35, 36, 37, 5, 39, 40, 41, 42,	/* 50 */ 25, 4, 35, 36, 24, 25, 19, 40, 41, 12,
/* 60 */ 1, 11, 4, 4, 6, 7, 8, 28, 5, 9,	/* 60 */ 15, 35, 36, 16, 35, 36, 40, 41, 42, 40,
/* 70 */ 10, 12, 5, 14, 28, 16, 13, 11, 13, 47,	/* 70 */ 41, 24, 25, 35, 36, 37, 5, 28, 40, 41,
/* 80 */ 35, 36, 13, 24, 25, 40, 41, 42, 35, 36,	/* 80 */ 42, 9, 10, 4, 13, 6, 7, 8, 9, 11,
/* 90 */ 37, 18, 43, 40, 41, 42, 35, 36, 19, 35,	/* 90 */ 35, 36, 17, 28, 13, 40, 41, 42, 35, 36,
/* 100 */ 36, 40, 41, 42, 40, 41, 47, 35, 36, 47,	/* 100 */ 1, 35, 36, 40, 41, 42, 40, 41, 4, 16,
/* 110 */ 47, 47, 40, 41, 20, 21, 22, 23, 47, 35,	/* 110 */ 6, 7, 8, 13, 15, 47, 20, 21, 22, 23,
/* 120 */ 36, 35, 47, 47, 40, 41, 40, 41,	/* 120 */ 15,
};	};
#define YY_SHIFT_USE_DFLT (-5)	#define YY_SHIFT_USE_DFLT (-1)
static signed char yy_shift_ofst[] = {	static signed char yy_shift_ofst[] = {
/* 0 */ -5, 6, -5, -5, -5, 31, -4, 8, -3, -5,	/* 0 */ -1, 47, -1, -1, -1, 99, 45, 105, 93, -1,
/* 10 */ 25, -5, 23, -5, -5, -5, 48, 58, 67, 58,	/* 10 */ 23, -1, 25, -1, -1, -1, 8, 104, 33, 104,
/* 20 */ -5, -5, -5, -5, -5, -5, 36, 50, -5, -5,	/* 20 */ -1, -1, -1, -1, -1, -1, 79, 10, -1, -1,
/* 30 */ 60, -5, 58, -5, 66, 58, 67, -5, 58, 67,	/* 30 */ 72, -1, 104, -1, 78, 104, 33, -1, 104, 33,
/* 40 */ 65, 69, -5, 59, -5, -5, 19, 73, 58, 67,	/* 40 */ 100, 81, -1, 30, -1, -1, 75, 27, 104, 33,
/* 50 */ 79, 94, 58, 63, -5, -5, -5, -5, 58, -5,	/* 50 */ 37, 96, 104, 71, -1, -1, -1, -1, 104, -1,
/* 60 */ 58, -5, -5,	/* 60 */ 104, -1, -1,
};	};
#define YY_REDUCE_USE_DFLT (-37)	#define YY_REDUCE_USE_DFLT (-30)
static signed char yy_reduce_ofst[] = {	static signed char yy_reduce_ofst[] = {
/* 0 */ -2, -29, -37, -37, -37, -36, -37, -37, 3, -37,	/* 0 */ -21, -29, -30, -30, -30, -4, -30, -30, -3, -30,
/* 10 */ -37, 39, -29, -37, -37, -37, -37, -7, -37, 86,	/* 10 */ -30, 49, -29, -30, -30, -30, -30, -8, -30, -27,
/* 20 */ -37, -37, -37, -37, -37, -37, 17, -37, -37, -37,	/* 20 */ -30, -30, -30, -30, -30, -30, -17, -30, -30, -30,
/* 30 */ -37, -37, 53, -37, -37, 64, -37, -37, 72, -37,	/* 30 */ -30, -30, 38, -30, -30, 66, -30, -30, 29, -30,
/* 40 */ -37, -37, 46, -29, -37, -37, -37, -37, -21, -37,	/* 40 */ -30, -30, 65, -29, -30, -30, -30, -30, 26, -30,
/* 50 */ -37, 49, 84, -37, -37, -37, -37, -37, 45, -37,	/* 50 */ -30, -13, 17, -30, -30, -30, -30, -30, 55, -30,
/* 60 */ 61, -37, -37,	/* 60 */ 63, -30, -30,
};	};
static YYACTIONTYPE yy_default[] = {	static YYACTIONTYPE yy_default[] = {
/* 0 */ 65, 103, 64, 66, 67, 103, 68, 103, 103, 92,	/* 0 */ 65, 103, 64, 66, 67, 103, 68, 103, 103, 92,
Line 518 static void yy_destructor(YYCODETYPE yymajor, YYMINORT	Line 518 static void yy_destructor(YYCODETYPE yymajor, YYMINORT
case 23:	case 23:
case 24:	case 24:
case 25:	case 25:
#line 144 "../../src/configparser.y"	#line 144 "./configparser.y"
{ buffer_free((yypminor->yy0)); }	{ buffer_free((yypminor->yy0)); }
#line 523 "configparser.c"	#line 523 "configparser.c"
break;	break;
case 35:	case 35:
#line 135 "../../src/configparser.y"	#line 135 "./configparser.y"
{ (yypminor->yy41)->free((yypminor->yy41)); }	{ (yypminor->yy41)->free((yypminor->yy41)); }
#line 528 "configparser.c"	#line 528 "configparser.c"
break;	break;
case 36:	case 36:
#line 136 "../../src/configparser.y"	#line 136 "./configparser.y"
{ (yypminor->yy41)->free((yypminor->yy41)); }	{ (yypminor->yy41)->free((yypminor->yy41)); }
#line 533 "configparser.c"	#line 533 "configparser.c"
break;	break;
case 37:	case 37:
#line 137 "../../src/configparser.y"	#line 137 "./configparser.y"
{ (yypminor->yy41)->free((yypminor->yy41)); }	{ (yypminor->yy41)->free((yypminor->yy41)); }
#line 538 "configparser.c"	#line 538 "configparser.c"
break;	break;
case 39:	case 39:
#line 138 "../../src/configparser.y"	#line 138 "./configparser.y"
{ array_free((yypminor->yy40)); }	{ array_free((yypminor->yy40)); }
#line 543 "configparser.c"	#line 543 "configparser.c"
break;	break;
case 40:	case 40:
#line 139 "../../src/configparser.y"	#line 139 "./configparser.y"
{ array_free((yypminor->yy40)); }	{ array_free((yypminor->yy40)); }
#line 548 "configparser.c"	#line 548 "configparser.c"
break;	break;
case 41:	case 41:
#line 140 "../../src/configparser.y"	#line 140 "./configparser.y"
{ buffer_free((yypminor->yy43)); }	{ buffer_free((yypminor->yy43)); }
#line 553 "configparser.c"	#line 553 "configparser.c"
break;	break;
case 42:	case 42:
#line 141 "../../src/configparser.y"	#line 141 "./configparser.y"
{ buffer_free((yypminor->yy43)); }	{ buffer_free((yypminor->yy43)); }
#line 558 "configparser.c"	#line 558 "configparser.c"
break;	break;
Line 823 static void yy_reduce(	Line 823 static void yy_reduce(
/* No destructor defined for global */	/* No destructor defined for global */
break;	break;
case 5:	case 5:
#line 117 "../../src/configparser.y"	#line 117 "./configparser.y"
{ yymsp[-1].minor.yy78 = NULL; }	{ yymsp[-1].minor.yy78 = NULL; }
#line 828 "configparser.c"	#line 828 "configparser.c"
yy_destructor(1,&yymsp[0].minor);	yy_destructor(1,&yymsp[0].minor);
Line 838 static void yy_reduce(	Line 838 static void yy_reduce(
yy_destructor(1,&yymsp[0].minor);	yy_destructor(1,&yymsp[0].minor);
break;	break;
case 9:	case 9:
#line 146 "../../src/configparser.y"	#line 146 "./configparser.y"
{	{
if (ctx->ok) {	if (ctx->ok) {
buffer_copy_string_buffer(yymsp[0].minor.yy41->key, yymsp[-2].minor.yy43);	buffer_copy_string_buffer(yymsp[0].minor.yy41->key, yymsp[-2].minor.yy43);
Line 866 static void yy_reduce(	Line 866 static void yy_reduce(
yy_destructor(2,&yymsp[-1].minor);	yy_destructor(2,&yymsp[-1].minor);
break;	break;
case 10:	case 10:
#line 170 "../../src/configparser.y"	#line 170 "./configparser.y"
{	{
array *vars = ctx->current->value;	array *vars = ctx->current->value;
data_unset *du;	data_unset *du;
Line 909 static void yy_reduce(	Line 909 static void yy_reduce(
yy_destructor(3,&yymsp[-1].minor);	yy_destructor(3,&yymsp[-1].minor);
break;	break;
case 11:	case 11:
#line 209 "../../src/configparser.y"	#line 209 "./configparser.y"
{	{
if (strchr(yymsp[0].minor.yy0->ptr, '.') == NULL) {	if (strchr(yymsp[0].minor.yy0->ptr, '.') == NULL) {
yygotominor.yy43 = buffer_init_string("var.");	yygotominor.yy43 = buffer_init_string("var.");
Line 924 static void yy_reduce(	Line 924 static void yy_reduce(
#line 924 "configparser.c"	#line 924 "configparser.c"
break;	break;
case 12:	case 12:
#line 221 "../../src/configparser.y"	#line 221 "./configparser.y"
{	{
yygotominor.yy41 = configparser_merge_data(yymsp[-2].minor.yy41, yymsp[0].minor.yy41);	yygotominor.yy41 = configparser_merge_data(yymsp[-2].minor.yy41, yymsp[0].minor.yy41);
if (NULL == yygotominor.yy41) {	if (NULL == yygotominor.yy41) {
Line 938 static void yy_reduce(	Line 938 static void yy_reduce(
yy_destructor(5,&yymsp[-1].minor);	yy_destructor(5,&yymsp[-1].minor);
break;	break;
case 13:	case 13:
#line 231 "../../src/configparser.y"	#line 231 "./configparser.y"
{	{
yygotominor.yy41 = yymsp[0].minor.yy41;	yygotominor.yy41 = yymsp[0].minor.yy41;
yymsp[0].minor.yy41 = NULL;	yymsp[0].minor.yy41 = NULL;
Line 946 static void yy_reduce(	Line 946 static void yy_reduce(
#line 946 "configparser.c"	#line 946 "configparser.c"
break;	break;
case 14:	case 14:
#line 236 "../../src/configparser.y"	#line 236 "./configparser.y"
{	{
yygotominor.yy41 = NULL;	yygotominor.yy41 = NULL;
if (strncmp(yymsp[0].minor.yy43->ptr, "env.", sizeof("env.") - 1) == 0) {	if (strncmp(yymsp[0].minor.yy43->ptr, "env.", sizeof("env.") - 1) == 0) {
Line 976 static void yy_reduce(	Line 976 static void yy_reduce(
#line 976 "configparser.c"	#line 976 "configparser.c"
break;	break;
case 15:	case 15:
#line 263 "../../src/configparser.y"	#line 263 "./configparser.y"
{	{
yygotominor.yy41 = (data_unset *)data_string_init();	yygotominor.yy41 = (data_unset *)data_string_init();
buffer_copy_string_buffer(((data_string *)(yygotominor.yy41))->value, yymsp[0].minor.yy0);	buffer_copy_string_buffer(((data_string *)(yygotominor.yy41))->value, yymsp[0].minor.yy0);
Line 986 static void yy_reduce(	Line 986 static void yy_reduce(
#line 986 "configparser.c"	#line 986 "configparser.c"
break;	break;
case 16:	case 16:
#line 270 "../../src/configparser.y"	#line 270 "./configparser.y"
{	{
yygotominor.yy41 = (data_unset *)data_integer_init();	yygotominor.yy41 = (data_unset *)data_integer_init();
((data_integer *)(yygotominor.yy41))->value = strtol(yymsp[0].minor.yy0->ptr, NULL, 10);	((data_integer *)(yygotominor.yy41))->value = strtol(yymsp[0].minor.yy0->ptr, NULL, 10);
Line 996 static void yy_reduce(	Line 996 static void yy_reduce(
#line 996 "configparser.c"	#line 996 "configparser.c"
break;	break;
case 17:	case 17:
#line 276 "../../src/configparser.y"	#line 276 "./configparser.y"
{	{
yygotominor.yy41 = (data_unset *)data_array_init();	yygotominor.yy41 = (data_unset *)data_array_init();
array_free(((data_array *)(yygotominor.yy41))->value);	array_free(((data_array *)(yygotominor.yy41))->value);
Line 1006 static void yy_reduce(	Line 1006 static void yy_reduce(
#line 1006 "configparser.c"	#line 1006 "configparser.c"
break;	break;
case 18:	case 18:
#line 282 "../../src/configparser.y"	#line 282 "./configparser.y"
{	{
yygotominor.yy40 = array_init();	yygotominor.yy40 = array_init();
}	}
Line 1015 static void yy_reduce(	Line 1015 static void yy_reduce(
yy_destructor(9,&yymsp[0].minor);	yy_destructor(9,&yymsp[0].minor);
break;	break;
case 19:	case 19:
#line 285 "../../src/configparser.y"	#line 285 "./configparser.y"
{	{
yygotominor.yy40 = yymsp[-1].minor.yy40;	yygotominor.yy40 = yymsp[-1].minor.yy40;
yymsp[-1].minor.yy40 = NULL;	yymsp[-1].minor.yy40 = NULL;
Line 1025 static void yy_reduce(	Line 1025 static void yy_reduce(
yy_destructor(9,&yymsp[0].minor);	yy_destructor(9,&yymsp[0].minor);
break;	break;
case 20:	case 20:
#line 290 "../../src/configparser.y"	#line 290 "./configparser.y"
{	{
if (buffer_is_empty(yymsp[0].minor.yy41->key) \|\|	if (buffer_is_empty(yymsp[0].minor.yy41->key) \|\|
NULL == array_get_element(yymsp[-2].minor.yy40, yymsp[0].minor.yy41->key->ptr)) {	NULL == array_get_element(yymsp[-2].minor.yy40, yymsp[0].minor.yy41->key->ptr)) {
Line 1046 static void yy_reduce(	Line 1046 static void yy_reduce(
yy_destructor(10,&yymsp[-1].minor);	yy_destructor(10,&yymsp[-1].minor);
break;	break;
case 21:	case 21:
#line 307 "../../src/configparser.y"	#line 307 "./configparser.y"
{	{
yygotominor.yy40 = yymsp[-1].minor.yy40;	yygotominor.yy40 = yymsp[-1].minor.yy40;
yymsp[-1].minor.yy40 = NULL;	yymsp[-1].minor.yy40 = NULL;
Line 1055 static void yy_reduce(	Line 1055 static void yy_reduce(
yy_destructor(10,&yymsp[0].minor);	yy_destructor(10,&yymsp[0].minor);
break;	break;
case 22:	case 22:
#line 312 "../../src/configparser.y"	#line 312 "./configparser.y"
{	{
yygotominor.yy40 = array_init();	yygotominor.yy40 = array_init();
array_insert_unique(yygotominor.yy40, yymsp[0].minor.yy41);	array_insert_unique(yygotominor.yy40, yymsp[0].minor.yy41);
Line 1064 static void yy_reduce(	Line 1064 static void yy_reduce(
#line 1064 "configparser.c"	#line 1064 "configparser.c"
break;	break;
case 23:	case 23:
#line 318 "../../src/configparser.y"	#line 318 "./configparser.y"
{	{
yygotominor.yy41 = yymsp[0].minor.yy41;	yygotominor.yy41 = yymsp[0].minor.yy41;
yymsp[0].minor.yy41 = NULL;	yymsp[0].minor.yy41 = NULL;
Line 1072 static void yy_reduce(	Line 1072 static void yy_reduce(
#line 1072 "configparser.c"	#line 1072 "configparser.c"
break;	break;
case 24:	case 24:
#line 322 "../../src/configparser.y"	#line 322 "./configparser.y"
{	{
buffer_copy_string_buffer(yymsp[0].minor.yy41->key, yymsp[-2].minor.yy43);	buffer_copy_string_buffer(yymsp[0].minor.yy41->key, yymsp[-2].minor.yy43);
buffer_free(yymsp[-2].minor.yy43);	buffer_free(yymsp[-2].minor.yy43);
Line 1090 static void yy_reduce(	Line 1090 static void yy_reduce(
case 26:	case 26:
break;	break;
case 27:	case 27:
#line 334 "../../src/configparser.y"	#line 334 "./configparser.y"
{	{
data_config *dc;	data_config *dc;
dc = (data_config *)array_get_element(ctx->srv->config_context, "global");	dc = (data_config *)array_get_element(ctx->srv->config_context, "global");
assert(dc);	force_assert(dc);
configparser_push(ctx, dc, 0);	configparser_push(ctx, dc, 0);
}	}
#line 1100 "configparser.c"	#line 1100 "configparser.c"
yy_destructor(12,&yymsp[0].minor);	yy_destructor(12,&yymsp[0].minor);
break;	break;
case 28:	case 28:
#line 341 "../../src/configparser.y"	#line 341 "./configparser.y"
{	{
data_config *cur;	data_config *cur;

cur = ctx->current;	cur = ctx->current;
configparser_pop(ctx);	configparser_pop(ctx);

assert(cur && ctx->current);	force_assert(cur && ctx->current);

yygotominor.yy78 = cur;	yygotominor.yy78 = cur;
}	}
Line 1119 static void yy_reduce(	Line 1119 static void yy_reduce(
yy_destructor(14,&yymsp[0].minor);	yy_destructor(14,&yymsp[0].minor);
break;	break;
case 29:	case 29:
#line 352 "../../src/configparser.y"	#line 352 "./configparser.y"
{	{
if (yymsp[-3].minor.yy78->context_ndx >= yymsp[0].minor.yy78->context_ndx) {	if (yymsp[-3].minor.yy78->context_ndx >= yymsp[0].minor.yy78->context_ndx) {
fprintf(stderr, "unreachable else condition\n");	fprintf(stderr, "unreachable else condition\n");
Line 1136 static void yy_reduce(	Line 1136 static void yy_reduce(
yy_destructor(15,&yymsp[-1].minor);	yy_destructor(15,&yymsp[-1].minor);
break;	break;
case 30:	case 30:
#line 364 "../../src/configparser.y"	#line 364 "./configparser.y"
{	{
yygotominor.yy78 = yymsp[0].minor.yy78;	yygotominor.yy78 = yymsp[0].minor.yy78;
yymsp[0].minor.yy78 = NULL;	yymsp[0].minor.yy78 = NULL;
Line 1144 static void yy_reduce(	Line 1144 static void yy_reduce(
#line 1144 "configparser.c"	#line 1144 "configparser.c"
break;	break;
case 31:	case 31:
#line 369 "../../src/configparser.y"	#line 369 "./configparser.y"
{	{
data_config *cur;	data_config *cur;

cur = ctx->current;	cur = ctx->current;
configparser_pop(ctx);	configparser_pop(ctx);

assert(cur && ctx->current);	force_assert(cur && ctx->current);

yygotominor.yy78 = cur;	yygotominor.yy78 = cur;
}	}
Line 1162 static void yy_reduce(	Line 1162 static void yy_reduce(
yy_destructor(14,&yymsp[0].minor);	yy_destructor(14,&yymsp[0].minor);
break;	break;
case 32:	case 32:
#line 380 "../../src/configparser.y"	#line 380 "./configparser.y"
{	{
data_config *dc;	data_config *dc;
buffer b, rvalue, *op;	buffer b, rvalue, *op;
Line 1186 static void yy_reduce(	Line 1186 static void yy_reduce(
op = buffer_init_string("=~");	op = buffer_init_string("=~");
break;	break;
default:	default:
assert(0);	force_assert(0);
return;	return;
}	}

Line 1318 static void yy_reduce(	Line 1318 static void yy_reduce(
yy_destructor(19,&yymsp[-2].minor);	yy_destructor(19,&yymsp[-2].minor);
break;	break;
case 33:	case 33:
#line 529 "../../src/configparser.y"	#line 529 "./configparser.y"
{	{
yygotominor.yy27 = CONFIG_COND_EQ;	yygotominor.yy27 = CONFIG_COND_EQ;
}	}
Line 1326 static void yy_reduce(	Line 1326 static void yy_reduce(
yy_destructor(20,&yymsp[0].minor);	yy_destructor(20,&yymsp[0].minor);
break;	break;
case 34:	case 34:
#line 532 "../../src/configparser.y"	#line 532 "./configparser.y"
{	{
yygotominor.yy27 = CONFIG_COND_MATCH;	yygotominor.yy27 = CONFIG_COND_MATCH;
}	}
Line 1334 static void yy_reduce(	Line 1334 static void yy_reduce(
yy_destructor(21,&yymsp[0].minor);	yy_destructor(21,&yymsp[0].minor);
break;	break;
case 35:	case 35:
#line 535 "../../src/configparser.y"	#line 535 "./configparser.y"
{	{
yygotominor.yy27 = CONFIG_COND_NE;	yygotominor.yy27 = CONFIG_COND_NE;
}	}
Line 1342 static void yy_reduce(	Line 1342 static void yy_reduce(
yy_destructor(22,&yymsp[0].minor);	yy_destructor(22,&yymsp[0].minor);
break;	break;
case 36:	case 36:
#line 538 "../../src/configparser.y"	#line 538 "./configparser.y"
{	{
yygotominor.yy27 = CONFIG_COND_NOMATCH;	yygotominor.yy27 = CONFIG_COND_NOMATCH;
}	}
Line 1350 static void yy_reduce(	Line 1350 static void yy_reduce(
yy_destructor(23,&yymsp[0].minor);	yy_destructor(23,&yymsp[0].minor);
break;	break;
case 37:	case 37:
#line 542 "../../src/configparser.y"	#line 542 "./configparser.y"
{	{
yygotominor.yy43 = NULL;	yygotominor.yy43 = NULL;
if (ctx->ok) {	if (ctx->ok) {
Line 1370 static void yy_reduce(	Line 1370 static void yy_reduce(
#line 1370 "configparser.c"	#line 1370 "configparser.c"
break;	break;
case 38:	case 38:
#line 559 "../../src/configparser.y"	#line 559 "./configparser.y"
{	{
if (ctx->ok) {	if (ctx->ok) {
if (0 != config_parse_file(ctx->srv, ctx, yymsp[0].minor.yy43->ptr)) {	if (0 != config_parse_file(ctx->srv, ctx, yymsp[0].minor.yy43->ptr)) {
Line 1384 static void yy_reduce(	Line 1384 static void yy_reduce(
yy_destructor(24,&yymsp[-1].minor);	yy_destructor(24,&yymsp[-1].minor);
break;	break;
case 39:	case 39:
#line 569 "../../src/configparser.y"	#line 569 "./configparser.y"
{	{
if (ctx->ok) {	if (ctx->ok) {
if (0 != config_parse_cmd(ctx->srv, ctx, yymsp[0].minor.yy43->ptr)) {	if (0 != config_parse_cmd(ctx->srv, ctx, yymsp[0].minor.yy43->ptr)) {
Line 1424 static void yy_parse_failed(	Line 1424 static void yy_parse_failed(
while( yypParser->yyidx>=0 ) yy_pop_parser_stack(yypParser);	while( yypParser->yyidx>=0 ) yy_pop_parser_stack(yypParser);
/* Here code is inserted which will be executed whenever the	/* Here code is inserted which will be executed whenever the
** parser fails */	** parser fails */
#line 108 "../../src/configparser.y"	#line 108 "./configparser.y"

ctx->ok = 0;	ctx->ok = 0;

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.1.1.1
changed lines
	Added in v.1.1.1.2.2.1