Index: ossp-pkg/cfg/AUTHORS RCS File: /v/ossp/cvs/ossp-pkg/cfg/AUTHORS,v rcsdiff -q -kk '-r1.1' '-r1.2' -u '/v/ossp/cvs/ossp-pkg/cfg/AUTHORS,v' 2>/dev/null --- AUTHORS 2002/08/02 19:07:12 1.1 +++ AUTHORS 2002/11/10 12:12:23 1.2 @@ -1,5 +1,5 @@ - _ ___ ____ ____ ____ __ - |_|_ _ / _ \/ ___/ ___|| _ \ ___ / _| __ _ + _ ___ ____ ____ ____ __ + |_|_ _ / _ \/ ___/ ___|| _ \ ___ / _| __ _ _|_||_| | | | \___ \___ \| |_) | / __| |_ / _` | |_||_|_| | |_| |___) |__) | __/ | (__| _| (_| | |_|_|_| \___/|____/____/|_| \___|_| \__, | Index: ossp-pkg/cfg/ChangeLog RCS File: /v/ossp/cvs/ossp-pkg/cfg/ChangeLog,v rcsdiff -q -kk '-r1.3' '-r1.4' -u '/v/ossp/cvs/ossp-pkg/cfg/ChangeLog,v' 2>/dev/null --- ChangeLog 2002/08/02 19:18:00 1.3 +++ ChangeLog 2002/11/10 12:12:23 1.4 @@ -1,14 +1,14 @@ - _ ___ ____ ____ ____ __ - |_|_ _ / _ \/ ___/ ___|| _ \ ___ / _| __ _ + _ ___ ____ ____ ____ __ + |_|_ _ / _ \/ ___/ ___|| _ \ ___ / _| __ _ _|_||_| | | | \___ \___ \| |_) | / __| |_ / _` | |_||_|_| | |_| |___) |__) | __/ | (__| _| (_| | |_|_|_| \___/|____/____/|_| \___|_| \__, | |___/ OSSP cfg - Configuration Parsing - + CHANGELOG - Changes between 0.9.0 and 0.9.1 (01-Jul-2002 to 02-Aug-2002) + Changes between 0.9.0 and 0.9.1 (01-Jul-2002 to xx-Nov-2002) *) Enhanced test suite by comparing against previously saved output [Ralf S. Engelschall ] Index: ossp-pkg/cfg/README RCS File: /v/ossp/cvs/ossp-pkg/cfg/README,v rcsdiff -q -kk '-r1.3' '-r1.4' -u '/v/ossp/cvs/ossp-pkg/cfg/README,v' 2>/dev/null --- README 2002/08/02 19:07:12 1.3 +++ README 2002/11/10 12:12:23 1.4 @@ -1,5 +1,5 @@ - _ ___ ____ ____ ____ __ - |_|_ _ / _ \/ ___/ ___|| _ \ ___ / _| __ _ + _ ___ ____ ____ ____ __ + |_|_ _ / _ \/ ___/ ___|| _ \ ___ / _| __ _ _|_||_| | | | \___ \___ \| |_) | / __| |_ / _` | |_||_|_| | |_| |___) |__) | __/ | (__| _| (_| | |_|_|_| \___/|____/____/|_| \___|_| \__, | Index: ossp-pkg/cfg/THANKS RCS File: /v/ossp/cvs/ossp-pkg/cfg/THANKS,v rcsdiff -q -kk '-r1.2' '-r1.3' -u '/v/ossp/cvs/ossp-pkg/cfg/THANKS,v' 2>/dev/null --- THANKS 2002/11/09 18:30:30 1.2 +++ THANKS 2002/11/10 12:12:23 1.3 @@ -1,5 +1,5 @@ - _ ___ ____ ____ ____ __ - |_|_ _ / _ \/ ___/ ___|| _ \ ___ / _| __ _ + _ ___ ____ ____ ____ __ + |_|_ _ / _ \/ ___/ ___|| _ \ ___ / _| __ _ _|_||_| | | | \___ \___ \| |_) | / __| |_ / _` | |_||_|_| | |_| |___) |__) | __/ | (__| _| (_| | |_|_|_| \___/|____/____/|_| \___|_| \__, | Index: ossp-pkg/cfg/TODO RCS File: /v/ossp/cvs/ossp-pkg/cfg/TODO,v rcsdiff -q -kk '-r1.3' '-r1.4' -u '/v/ossp/cvs/ossp-pkg/cfg/TODO,v' 2>/dev/null --- TODO 2002/10/05 15:49:23 1.3 +++ TODO 2002/11/10 12:12:23 1.4 @@ -1,5 +1,5 @@ - _ ___ ____ ____ ____ __ - |_|_ _ / _ \/ ___/ ___|| _ \ ___ / _| __ _ + _ ___ ____ ____ ____ __ + |_|_ _ / _ \/ ___/ ___|| _ \ ___ / _| __ _ _|_||_| | | | \___ \___ \| |_) | / __| |_ / _` | |_||_|_| | |_| |___) |__) | __/ | (__| _| (_| | |_|_|_| \___/|____/____/|_| \___|_| \__, | @@ -7,7 +7,7 @@ OSSP cfg - Configuration Parsing TODO - + o finish/fix implementation of cfg_node_select() o implement cfg_node_find() o fix internal linkage with "left sibling" pointer @@ -33,7 +33,7 @@ - wieso geht sample.cfg nicht als Arg bei "make check"? - newline in error message -$ ./cfg_test sample2.cfg +$ ./cfg_test sample2.cfg ERROR: quu'> @@ -41,7 +41,7 @@ rewrite-uri { } rewrite-uri ^/(.*) /path/$1 --redirect=permanent q{ - %{SOURCE} != "x" + %{SOURCE} != "x" }; @@ -53,7 +53,7 @@ - option ("--foo=BAR") via name & regex - argument ("foo") via regex - amount: - - 1 + - 1 - 0/1 ? - 0..n * - 1..n + @@ -89,16 +89,16 @@ TOK ::= string "..." config ::= SEQ(directory|user|rewrite|access) -directory ::= DIR("directory",*,) -dir_options ::= +directory ::= DIR("directory",*,) +dir_options ::= user ::= DIR("user",/^[a-z]$/) -rewrite ::= +rewrite ::= access ::= "access" ("allow"|"deny"):action SEQ(access_list):acl access_list ::= m/^!?%{ID}$/ acl ::= "acl" TOK:name acl_list acl_list ::= SEQ(acl_entry) -acl_entry ::= acl_action "from" net-addr:src "to" net-addr:dst +acl_entry ::= acl_action "from" net-addr:src "to" net-addr:dst acl_action ::= "allow"|"deny" net_addr ::= net_hostname | net_ipv4addr | net_ipv6addr @@ -124,28 +124,28 @@ --------------------------------------------------------------------------- sequence ROOT { - directive foo; + directive foo; directive bar; directive quux --count=1:oo; }; sequence bar-seq { - directive foo --count=0:1; + directive foo --count=0:1; directive baz --count=1:oo; }; -directive foo { +directive foo { token - on|off|yes|no; }; directive bar { - token path /.*; + token path /.*; sequence bar-seq; }; -directive baz { - option fuck; - option fuck2; +directive baz { + option fuck; + option fuck2; sequence { - directive foo { + directive foo { option nase (baer|hugo); - option foo [0-9]; + option foo [0-9]; token ip-address; }; }; @@ -182,8 +182,8 @@ ------------------------------------------------------------------------------- directive token { - opt1 { /.../ opt2=/.../ } { - directive { /^token$/ }; + opt1 { /.../ opt2=/.../ } { + directive { /^token$/ }; name { m/.../; m/^[a-zA-Z][a-zA-Z0-9_.-]*$/ } ?; name { m/(...|[a-zA-Z][a-zA-Z0-9_.-]*$)/ } ?; regex { m/^.+$/ }; @@ -195,14 +195,14 @@ a?b((c|d)+e)?f A m/a/ ? -B m/b/ +B m/b/ { { C m/c/ ; - D m/d/ + D m/d/ } + E m/e/ -} ? +} ? F f ::= + Index: ossp-pkg/cfg/aclocal.m4 RCS File: /v/ossp/cvs/ossp-pkg/cfg/aclocal.m4,v rcsdiff -q -kk '-r1.1' '-r1.2' -u '/v/ossp/cvs/ossp-pkg/cfg/aclocal.m4,v' 2>/dev/null --- aclocal.m4 2002/07/09 08:29:19 1.1 +++ aclocal.m4 2002/11/10 12:12:23 1.2 @@ -244,7 +244,7 @@ if test ".$enable_maintainer" = .yes; then bison_version="" for prog in bison bison-beta bison-alpha bison-snap; do - AC_PATH_PROG($1, $prog, NA) + AC_PATH_PROG($1, $prog, NA) if test ".$$1" != .NA; then bison_version=`($$1 --version | head -1 | sed -e 's;^[[^0-9]]*\([[0-9]][[0-9.]]*\).*;\1;') 2>/dev/null` case "$bison_version" in @@ -273,7 +273,7 @@ if test ".$enable_maintainer" = .yes; then flex_version="" for prog in flex flex-beta flex-alpha flex-snap; do - AC_PATH_PROG($1, $prog, NA) + AC_PATH_PROG($1, $prog, NA) if test ".$$1" != .NA; then flex_version=`($$1 --version | head -1 | sed -e 's;^[[^0-9]]*\([[0-9]][[0-9.]]*\).*;\1;') 2>/dev/null` case "$flex_version" in Index: ossp-pkg/cfg/cfg-config.in RCS File: /v/ossp/cvs/ossp-pkg/cfg/cfg-config.in,v rcsdiff -q -kk '-r1.1' '-r1.2' -u '/v/ossp/cvs/ossp-pkg/cfg/cfg-config.in,v' 2>/dev/null --- cfg-config.in 2002/07/09 08:29:19 1.1 +++ cfg-config.in 2002/11/10 12:12:23 1.2 @@ -29,7 +29,7 @@ ## cfg-config.in: OSSP cfg build utility ## -DIFS=' +DIFS=' ' prefix="@prefix@" Index: ossp-pkg/cfg/cfg.pod RCS File: /v/ossp/cvs/ossp-pkg/cfg/cfg.pod,v rcsdiff -q -kk '-r1.8' '-r1.9' -u '/v/ossp/cvs/ossp-pkg/cfg/cfg.pod,v' 2>/dev/null --- cfg.pod 2002/10/05 15:49:23 1.8 +++ cfg.pod 2002/11/10 12:12:23 1.9 @@ -61,26 +61,26 @@ =item B -cfg_create, -cfg_destroy, -cfg_error, -cfg_version, -cfg_import, -cfg_export, +cfg_create, +cfg_destroy, +cfg_error, +cfg_version, +cfg_import, +cfg_export, cfg_node_create, cfg_node_destroy, -cfg_node_clone, -cfg_node_set, -cfg_node_get, -cfg_node_root, +cfg_node_clone, +cfg_node_set, +cfg_node_get, +cfg_node_root, cfg_node_select, -cfg_node_find, -cfg_node_apply, -cfg_node_cmp, -cfg_node_link, +cfg_node_find, +cfg_node_apply, +cfg_node_cmp, +cfg_node_link, cfg_node_unlink, -cfg_data_set, -cfg_data_get, +cfg_data_set, +cfg_data_get, cfg_data_ctrl =back @@ -110,7 +110,7 @@ | B | B B B -B ::= B +B ::= B | B B B ::= B B B @@ -224,7 +224,7 @@ parent .. lbroth -> rbroth <- - child[1] + child[1] child[L] virtualhost[2].directory @@ -238,8 +238,8 @@ B -B ::= B - B +B ::= B + B B B ::= "./" # current node @@ -253,7 +253,7 @@ | "//" # descendant nodes B ::= / />/ - | B + | B B ::= I | /\[/ B /\]/ @@ -262,7 +262,7 @@ | B /,/ # short for: num,-1 | /,/ B # short for: 1,num | B /,/ B - + B ::= /^[+-]?[0-9]+/ B ::= "Regular Expression (PCRE-based)" Index: ossp-pkg/cfg/cfg_buf.c RCS File: /v/ossp/cvs/ossp-pkg/cfg/cfg_buf.c,v rcsdiff -q -kk '-r1.5' '-r1.6' -u '/v/ossp/cvs/ossp-pkg/cfg/cfg_buf.c,v' 2>/dev/null --- cfg_buf.c 2002/07/17 15:04:08 1.5 +++ cfg_buf.c 2002/11/10 12:12:23 1.6 @@ -112,8 +112,8 @@ return CFG_ERR_FMT; if ((rc = cfg_buf_resize(buf, n)) != CFG_OK) return rc; - if ((n = cfg_fmt_vsprintf(buf->buf_ptr + buf->buf_len, - buf->buf_size - buf->buf_len, + if ((n = cfg_fmt_vsprintf(buf->buf_ptr + buf->buf_len, + buf->buf_size - buf->buf_len, fmt, ap)) == -1) return CFG_ERR_FMT; buf->buf_len += n; Index: ossp-pkg/cfg/cfg_data.c RCS File: /v/ossp/cvs/ossp-pkg/cfg/cfg_data.c,v rcsdiff -q -kk '-r1.5' '-r1.6' -u '/v/ossp/cvs/ossp-pkg/cfg/cfg_data.c,v' 2>/dev/null --- cfg_data.c 2002/08/09 20:37:12 1.5 +++ cfg_data.c 2002/11/10 12:12:23 1.6 @@ -128,7 +128,7 @@ data2->value.s = NULL; } else { - memcpy((void *)&(data2->value), + memcpy((void *)&(data2->value), (void *)&(data->value), sizeof(cfg_data_value_t)); } } @@ -162,7 +162,7 @@ case CFG_DATA_ATTR_VALUE: { switch (data->type) { case CFG_DATA_TYPE_PTR: { - data->value.p = (void *)va_arg(ap, void *); + data->value.p = (void *)va_arg(ap, void *); break; } case CFG_DATA_TYPE_STR: { Index: ossp-pkg/cfg/cfg_fmt.c RCS File: /v/ossp/cvs/ossp-pkg/cfg/cfg_fmt.c,v rcsdiff -q -kk '-r1.2' '-r1.3' -u '/v/ossp/cvs/ossp-pkg/cfg/cfg_fmt.c,v' 2>/dev/null --- cfg_fmt.c 2002/07/17 15:04:08 1.2 +++ cfg_fmt.c 2002/11/10 12:12:23 1.3 @@ -129,7 +129,7 @@ #define FLOAT_DIGITS 6 #define EXPONENT_LENGTH 10 -/* NUM_BUF_SIZE is the size of the buffer used for arithmetic +/* NUM_BUF_SIZE is the size of the buffer used for arithmetic conversions. This is a magic number; do NOT decrease it! */ #define NUM_BUF_SIZE 512 #define NDIG 80 @@ -149,7 +149,7 @@ #define cfg_fmt_islower(c) (islower(((unsigned char)(c)))) #define cfg_fmt_tolower(c) (tolower((unsigned char)(c))) -/* +/* * Convert decimal number to its string representation. The number of * digits is specified by ndigit decpt is set to the position of the * decimal point sign is set to 0 for positive, 1 for negative. buf must @@ -164,10 +164,10 @@ static char * cfg_fmt_cvt( - double arg, - int ndigits, - int *decpt, - int *sign, + double arg, + int ndigits, + int *decpt, + int *sign, int eflag, char *buf) { @@ -243,9 +243,9 @@ static char * cfg_fmt_gcvt( - double number, - int ndigit, - char *buf, + double number, + int ndigit, + char *buf, int altform) { int sign; @@ -327,7 +327,7 @@ } /* - * Convert a string to decimal value + * Convert a string to decimal value */ #define NUM(c) ((c) - '0') #define STR_TO_DEC(str, num) { \ @@ -337,7 +337,7 @@ num += NUM(*str++) ; \ } \ } - + /* * This macro does zero padding so that the precision requirement is * satisfied. The padding is done by adding '0's to the left of the @@ -352,7 +352,7 @@ } /* - * This macro does padding. + * This macro does padding. * The padding is done by printing the character ch. */ #define PAD(width, len, ch) \ @@ -386,9 +386,9 @@ */ static char * conv_10( - register long_int num, + register long_int num, register int is_unsigned, - register int *is_negative, + register int *is_negative, char *buf_end, register size_t *len) { @@ -401,7 +401,7 @@ } else { *is_negative = (num < 0); - /* On a 2's complement machine, negating the most negative integer + /* On a 2's complement machine, negating the most negative integer results in a number that cannot be represented as a signed integer. Here is what we do to obtain the number's magnitude: a. add 1 to the number @@ -428,9 +428,9 @@ static char * conv_10_quad( - quad_int num, + quad_int num, register int is_unsigned, - register int *is_negative, + register int *is_negative, char *buf_end, register size_t *len) { @@ -443,7 +443,7 @@ } else { *is_negative = (num < 0); - /* On a 2's complement machine, negating the most negative integer + /* On a 2's complement machine, negating the most negative integer result in a number that cannot be represented as a signed integer. Here is what we do to obtain the number's magnitude: a. add 1 to the number @@ -475,12 +475,12 @@ */ static char * conv_fp( - register char format, + register char format, register double num, - int add_dp, - int precision, + int add_dp, + int precision, int *is_negative, - char *buf, + char *buf, size_t *len) { register char *s = buf; @@ -536,7 +536,7 @@ *s++ = format; /* either e or E */ decimal_point--; if (decimal_point != 0) { - p = conv_10((long_int) decimal_point, FALSE, &exponent_is_negative, + p = conv_10((long_int) decimal_point, FALSE, &exponent_is_negative, &temp[EXPONENT_LENGTH], &t_len); *s++ = exponent_is_negative ? '-' : '+'; /* Make sure the exponent has at least 2 digits */ @@ -573,10 +573,10 @@ static char * conv_p2( - register u_long_int num, + register u_long_int num, register int nbits, - char format, - char *buf_end, + char format, + char *buf_end, register size_t *len) { register int mask = (1 << nbits) - 1; @@ -593,10 +593,10 @@ static char * conv_p2_quad( - u_quad_int num, + u_quad_int num, register int nbits, - char format, - char *buf_end, + char format, + char *buf_end, register size_t *len) { register int mask = (1 << nbits) - 1; @@ -611,14 +611,14 @@ return p; } -/* +/* * cfg_fmt_format(), the generic printf-style formatting routine * and heart of this piece of source. */ -int +int cfg_fmt_format( - cfg_fmt_format_t *vbuff, - const char *fmt, + cfg_fmt_format_t *vbuff, + const char *fmt, va_list ap) { register char *sp; @@ -912,7 +912,7 @@ else { /* use &num_buf[1], so that we have room for the sign */ s = conv_fp(*fmt, fp_num, alternate_form, - (adjust_precision == FALSE) ? FLOAT_DIGITS : precision, + (adjust_precision == FALSE) ? FLOAT_DIGITS : precision, &is_negative, &num_buf[1], &s_len); if (is_negative) prefix_char = '-'; @@ -987,7 +987,7 @@ break; /* - * Pointer argument type. + * Pointer argument type. */ case 'p': #if defined(SIZEOF_LONG_LONG) && (SIZEOF_LONG_LONG == SIZEOF_VOID_P) @@ -1021,7 +1021,7 @@ s = NULL; if (vbuff->format != NULL) { vbuff->format(vbuff, - &prefix_char, &pad_char, &s, &s_len, + &prefix_char, &pad_char, &s, &s_len, num_buf, NUM_BUF_SIZE, extinfo, *fmt, &ap); if (s == NULL) return -1; @@ -1052,7 +1052,7 @@ } /* - * Print the string s. + * Print the string s. */ for (i = s_len; i != 0; i--) { INS_CHAR(*s, sp, bep, cc); Index: ossp-pkg/cfg/cfg_fmt.h RCS File: /v/ossp/cvs/ossp-pkg/cfg/cfg_fmt.h,v rcsdiff -q -kk '-r1.2' '-r1.3' -u '/v/ossp/cvs/ossp-pkg/cfg/cfg_fmt.h,v' 2>/dev/null --- cfg_fmt.h 2002/07/17 15:04:08 1.2 +++ cfg_fmt.h 2002/11/10 12:12:23 1.3 @@ -51,17 +51,17 @@ char *num_buf, /* input arg: temporary buffer */ int num_buf_size, /* input arg: temporary buffer len */ char *extinfo, /* input arg: extension information */ - char fmt_char, /* input arg: current formatting character */ + char fmt_char, /* input arg: current formatting character */ va_list *ap /* in/out arg: variable argument pointer */ ); /* arbitrary passed-through application data */ - union { - int i; - long l; - double d; - void *vp; - } data[6]; + union { + int i; + long l; + double d; + void *vp; + } data[6]; }; typedef struct cfg_fmt_format_st cfg_fmt_format_t; Index: ossp-pkg/cfg/cfg_grid.c RCS File: /v/ossp/cvs/ossp-pkg/cfg/cfg_grid.c,v rcsdiff -q -kk '-r1.3' '-r1.4' -u '/v/ossp/cvs/ossp-pkg/cfg/cfg_grid.c,v' 2>/dev/null --- cfg_grid.c 2002/11/09 16:55:23 1.3 +++ cfg_grid.c 2002/11/10 12:12:23 1.4 @@ -34,7 +34,7 @@ * size objects. Inside OSSP cfg we have lots of those objects and * if we would manage them directly through malloc(3) it would be to * run-time expensive and waste too much total memory. - * + * * It works by collecting together larger segments (cfg_grid_seg_t) of * those fixed size objects (cfg_grid_tile_t) and linking them into * a top-level grid structure (cfg_grid_t). The number of tiles in a @@ -45,7 +45,7 @@ * arranged as a linear array after a heading linkage structure. The * free tiles are remembered in a single linked list. So the grid in * memory looks like this: - * + * * -----BEGIN EMBEDDED OBJECT----- * Content-type: application/fig * Description: grid memory allocator memory architecture @@ -199,7 +199,7 @@ int g_tile_num_first; /* number of tiles in first segment */ }; -/* +/* * Align a size to the next larger or equal size which is likely to have the * longest *relevant* CPU-specific memory word alignment restrictions. */ @@ -216,10 +216,10 @@ } /* create a grid segment [INTERNAL] */ -static cfg_rc_t +static cfg_rc_t cfg_grid_seg_create( - cfg_grid_seg_t **pseg, - size_t tile_size, + cfg_grid_seg_t **pseg, + size_t tile_size, int tile_num) { size_t seg_top_size; @@ -275,7 +275,7 @@ return CFG_ERR_ARG; if (tile_num < 1) return CFG_ERR_ARG; - + /* determine (aligned) sizes */ tile_size = cfg_mem_align(tile_size); @@ -303,13 +303,13 @@ } /* destroy a grid */ -cfg_rc_t +cfg_rc_t cfg_grid_destroy( cfg_grid_t *grid) { cfg_grid_seg_t *seg; cfg_grid_seg_t *seg_last; - + /* consistency checks */ if (grid == NULL) return CFG_ERR_ARG; @@ -385,9 +385,9 @@ } /* find grid segment where tile is stored [INTERNAL] */ -static cfg_rc_t +static cfg_rc_t cfg_grid_seg_find( - cfg_grid_t *grid, + cfg_grid_t *grid, cfg_grid_seg_t **pseg, cfg_grid_tile_t *tile) { @@ -395,7 +395,7 @@ seg = CFG_RING_FIRST(&grid->g_seg); while (seg != CFG_RING_SENTINEL(&grid->g_seg, cfg_grid_seg_t, gs_link)) { - if ( seg->gs_tile_base <= tile + if ( seg->gs_tile_base <= tile && tile < (seg->gs_tile_base+(grid->g_tile_size*seg->gs_tile_num))) { if (pseg != NULL) *pseg = seg; @@ -407,9 +407,9 @@ } /* free a tile to a grid */ -cfg_rc_t +cfg_rc_t cfg_grid_free( - cfg_grid_t *grid, + cfg_grid_t *grid, void *_tile) { cfg_grid_seg_t *seg; @@ -422,7 +422,7 @@ /* consistency checks */ if (grid == NULL || tile == NULL) return CFG_ERR_ARG; - + /* find segment of tile */ if ((rc = cfg_grid_seg_find(grid, &seg, tile)) != CFG_OK) return rc; @@ -443,13 +443,13 @@ } /* test whether a tile is inside a grid */ -cfg_rc_t +cfg_rc_t cfg_grid_inside( - cfg_grid_t *grid, + cfg_grid_t *grid, void *_tile) { cfg_grid_tile_t *tile; - + /* cast to internal structure */ tile = (cfg_grid_tile_t *)_tile; @@ -462,11 +462,11 @@ } /* determine grid statistics */ -cfg_rc_t +cfg_rc_t cfg_grid_stat( - cfg_grid_t *grid, - int *pchunks, - int *pbytes_mgmt, int *pbytes_used, int *pbytes_free, + cfg_grid_t *grid, + int *pchunks, + int *pbytes_mgmt, int *pbytes_used, int *pbytes_free, int *ptiles_used, int *ptiles_free) { cfg_grid_seg_t *seg; Index: ossp-pkg/cfg/cfg_main.c RCS File: /v/ossp/cvs/ossp-pkg/cfg/cfg_main.c,v rcsdiff -q -kk '-r1.6' '-r1.7' -u '/v/ossp/cvs/ossp-pkg/cfg/cfg_main.c,v' 2>/dev/null --- cfg_main.c 2002/11/09 14:15:55 1.6 +++ cfg_main.c 2002/11/10 12:12:23 1.7 @@ -166,8 +166,8 @@ } } /* FIXME: CFG_FMT_XML */ - else - return CFG_ERR_INT; + else + return CFG_ERR_INT; /* FIXME: merge: cfg->root[node] := cfg->root[node] + root */ cfg->root = root; @@ -190,11 +190,11 @@ return rv; } /* FIXME: CFG_FMT_XML */ - else - return CFG_ERR_INT; + else + return CFG_ERR_INT; /* provide output */ - if (ex_len == 0) + if (ex_len == 0) *ex_ptr = output; else { n = strlen(output); Index: ossp-pkg/cfg/cfg_node.c RCS File: /v/ossp/cvs/ossp-pkg/cfg/cfg_node.c,v rcsdiff -q -kk '-r1.14' '-r1.15' -u '/v/ossp/cvs/ossp-pkg/cfg/cfg_node.c,v' 2>/dev/null --- cfg_node.c 2002/08/01 11:20:39 1.14 +++ cfg_node.c 2002/11/10 12:12:23 1.15 @@ -260,7 +260,7 @@ cfg_node_t *n; if (k == NULL) return CFG_ERR_ARG; - *k = 0; + *k = 0; n = node; while ((n = n->parent) != NULL) (*k)++; @@ -316,18 +316,18 @@ return CFG_OK; } -static cfg_rc_t +static cfg_rc_t cfg_node_select_step1( cfg_t *, cfg_node_t *, cfg_node_t ***, long *, const char *); -static cfg_rc_t +static cfg_rc_t cfg_node_select_step2( cfg_t *, cfg_node_t *, cfg_node_t ***, long *, const char *, const char *, size_t, long, long, long *); -static cfg_rc_t +static cfg_rc_t cfg_node_select_step3( - cfg_t *cfg, - cfg_node_t *node, - cfg_node_t ***result_vec, long *result_len, + cfg_t *cfg, + cfg_node_t *node, + cfg_node_t ***result_vec, long *result_len, const char *spec, const char *cpSel, size_t nSel, long nFilMin, long nFilMax, @@ -359,11 +359,11 @@ return rc; } -static cfg_rc_t +static cfg_rc_t cfg_node_select_step2( - cfg_t *cfg, - cfg_node_t *node, - cfg_node_t ***result_vec, long *result_len, + cfg_t *cfg, + cfg_node_t *node, + cfg_node_t ***result_vec, long *result_len, const char *spec, const char *cpSel, size_t nSel, long nFilMin, long nFilMax, @@ -459,11 +459,11 @@ return rc; } -static cfg_rc_t +static cfg_rc_t cfg_node_select_step1( - cfg_t *cfg, - cfg_node_t *node, - cfg_node_t ***result_vec, long *result_len, + cfg_t *cfg, + cfg_node_t *node, + cfg_node_t ***result_vec, long *result_len, const char *spec) { const char *cpSel; size_t nSel; @@ -481,7 +481,7 @@ return CFG_OK; /* determine selection step information */ - cpSel = spec; + cpSel = spec; nSel = strcspn(cpSel, "[/"); cp = cpSel+nSel; nFilMin = 1; @@ -548,10 +548,10 @@ cfg_rc_t cfg_node_select( - cfg_t *cfg, - cfg_node_t *node, - cfg_node_t ***result_vec, - const char *fmt, + cfg_t *cfg, + cfg_node_t *node, + cfg_node_t ***result_vec, + const char *fmt, ...) { cfg_rc_t rc; @@ -594,22 +594,22 @@ return CFG_OK; } -cfg_rc_t +cfg_rc_t cfg_node_find( - cfg_t *cfg, - cfg_node_t *node, + cfg_t *cfg, + cfg_node_t *node, cfg_rc_t (*cb_fct_cmp)(cfg_t *, cfg_node_t *, void *), - void *cb_ctx_cmp, + void *cb_ctx_cmp, cfg_node_t **cont) { /* FIXME */ return CFG_ERR_INT; } -cfg_rc_t +cfg_rc_t cfg_node_apply( - cfg_t *cfg, - cfg_node_t *node, + cfg_t *cfg, + cfg_node_t *node, cfg_rc_t (*cb_fct_cmp)(cfg_t *, cfg_node_t *, void *), void *cb_ctx_cmp, cfg_rc_t (*cb_fct_cb)(cfg_t *, cfg_node_t *, void *), @@ -625,12 +625,12 @@ if (rc != CFG_ERR_NDE) return rc; if (node->child1 != NULL) - if ((rc = cfg_node_apply(cfg, node->child1, + if ((rc = cfg_node_apply(cfg, node->child1, cb_fct_cmp, cb_ctx_cmp, cb_fct_cb, cb_ctx_cb)) != CFG_OK) return rc; if (node->rbroth != NULL) - if ((rc = cfg_node_apply(cfg, node->rbroth, + if ((rc = cfg_node_apply(cfg, node->rbroth, cb_fct_cmp, cb_ctx_cmp, cb_fct_cb, cb_ctx_cb)) != CFG_OK) return rc; @@ -640,8 +640,8 @@ cfg_rc_t cfg_node_cmp( - cfg_t *cfg, - cfg_node_t *node, + cfg_t *cfg, + cfg_node_t *node, void *token) { if (cfg == NULL || node == NULL || token == NULL) @@ -669,7 +669,7 @@ n->parent = node->parent; n = n->rbroth; } - n->rbroth = node->rbroth; + n->rbroth = node->rbroth; node->rbroth = node2; } else if (attr == CFG_NODE_ATTR_CHILD1) { @@ -684,7 +684,7 @@ node->child1 = node2; } /* FIXME more linkage possibilities */ - else + else return CFG_ERR_ARG; return CFG_OK; } Index: ossp-pkg/cfg/cfg_node.h RCS File: /v/ossp/cvs/ossp-pkg/cfg/cfg_node.h,v rcsdiff -q -kk '-r1.6' '-r1.7' -u '/v/ossp/cvs/ossp-pkg/cfg/cfg_node.h,v' 2>/dev/null --- cfg_node.h 2002/07/17 15:04:08 1.6 +++ cfg_node.h 2002/11/10 12:12:23 1.7 @@ -46,7 +46,7 @@ char *token; /* pointer to corresponding token string */ /* node annotation */ - cfg_data_t data; /* annotation data */ + cfg_data_t data; /* annotation data */ /* node source location */ char *srcname; /* name of original source configuration */ Index: ossp-pkg/cfg/cfg_syn.c RCS File: /v/ossp/cvs/ossp-pkg/cfg/cfg_syn.c,v rcsdiff -q -kk '-r1.13' '-r1.14' -u '/v/ossp/cvs/ossp-pkg/cfg/cfg_syn.c,v' 2>/dev/null --- cfg_syn.c 2002/07/18 15:34:55 1.13 +++ cfg_syn.c 2002/11/10 12:12:23 1.14 @@ -48,16 +48,16 @@ /* build a node tree according to a textual specification */ cfg_rc_t cfg_syn_import( - cfg_t *cfg, - cfg_node_t **node, + cfg_t *cfg, + cfg_node_t **node, const char *in_ptr, size_t in_len, - char *err_buf, + char *err_buf, size_t err_len) { cfg_syn_ctx_t ctx; void *yyscan; - + /* argument sanity checking */ if (node == NULL || in_ptr == NULL || in_len == 0) return CFG_ERR_ARG; @@ -66,7 +66,7 @@ cfg_syn_lex_init(&yyscan); cfg_syn_set_extra(&ctx, yyscan); - /* establish our own context which is passed + /* establish our own context which is passed through the parser and scanner */ ctx.inputptr = in_ptr; ctx.inputbuf = in_ptr; @@ -155,7 +155,7 @@ *cp++ = '\0'; /* remember parsing error: part I (context part) */ - cfg_fmt_sprintf(ctx->err_buf, ctx->err_len, + cfg_fmt_sprintf(ctx->err_buf, ctx->err_len, "line %d, column %d: `%s'", line, column, cpBuf); free(cpBuf); @@ -227,7 +227,7 @@ plain = 1; for (cp = token; *cp != '\0'; cp++) { - if ( !isprint((int)(*cp)) + if ( !isprint((int)(*cp)) || strchr(" \n\r\t\b\f;{}\\\"'", (int)(*cp)) != NULL) { plain = 0; break; @@ -307,8 +307,8 @@ } cfg_rc_t cfg_syn_export( - cfg_t *cfg, - cfg_node_t *node, + cfg_t *cfg, + cfg_node_t *node, char **output) { cfg_buf_t *buf; Index: ossp-pkg/cfg/cfg_syn_parse.y RCS File: /v/ossp/cvs/ossp-pkg/cfg/cfg_syn_parse.y,v rcsdiff -q -kk '-r1.3' '-r1.4' -u '/v/ossp/cvs/ossp-pkg/cfg/cfg_syn_parse.y,v' 2>/dev/null --- cfg_syn_parse.y 2002/07/10 12:00:23 1.3 +++ cfg_syn_parse.y 2002/11/10 12:12:23 1.4 @@ -43,10 +43,10 @@ #define YYPARSE_PARAM ctx #define YYLEX_PARAM CTX->yyscan -/* provide an explicit prototype for the yylex() function but use - "void *" instead of correct type because at this point in the +/* provide an explicit prototype for the yylex() function but use + "void *" instead of correct type because at this point in the generation process we have the types still not available */ -extern int yylex(/*YYSTYPE*/ void *lvalp, +extern int yylex(/*YYSTYPE*/ void *lvalp, /*YYLTYPE*/ void *llocp, cfg_syn_ctx_t *ctx); /* generate verbose error messages and remember them inside the context */ @@ -90,7 +90,7 @@ %right T_OPEN %right T_CLOSE -/* grammar start rule +/* grammar start rule (technically redundant but explicit to be sure) */ %start configuration @@ -113,13 +113,13 @@ ; directives - : /* empty */ { + : /* empty */ { $$ = NULL; } - | directive { - $$ = $1; + | directive { + $$ = $1; } - | directive T_SEP directives { + | directive T_SEP directives { cfg_node_set(CTX->cfg, $1, CFG_NODE_ATTR_RBROTH, $3); $$ = $1; } @@ -135,22 +135,22 @@ } ; -tokens - : token { - $$ = $1; +tokens + : token { + $$ = $1; } - | token tokens { + | token tokens { cfg_node_set(CTX->cfg, $1, CFG_NODE_ATTR_RBROTH, $2); $$ = $1; } ; token - : T_OPEN sequence T_CLOSE { - $$ = $2; + : T_OPEN sequence T_CLOSE { + $$ = $2; } | string { - $$ = $1; + $$ = $1; } ; @@ -160,7 +160,7 @@ cfg_node_create(CTX->cfg, &n); cfg_node_set(CTX->cfg, n, CFG_NODE_ATTR_TYPE, CFG_NODE_TYPE_ARG); cfg_node_set(CTX->cfg, n, CFG_NODE_ATTR_TOKEN, $1); - $$ = n; + $$ = n; } ; Index: ossp-pkg/cfg/cfg_syn_scan.l RCS File: /v/ossp/cvs/ossp-pkg/cfg/cfg_syn_scan.l,v rcsdiff -q -kk '-r1.12' '-r1.13' -u '/v/ossp/cvs/ossp-pkg/cfg/cfg_syn_scan.l,v' 2>/dev/null --- cfg_syn_scan.l 2002/11/09 14:34:01 1.12 +++ cfg_syn_scan.l 2002/11/10 12:12:23 1.13 @@ -79,7 +79,7 @@ %x SS_CO_C /* the delimiting character for flexible quoting has to one a - special character c, i.e., one of !"#$%&'()*+,-./:;<=>?@[\]^_`{|}~ or + special character c, i.e., one of !"#$%&'()*+,-./:;<=>?@[\]^_`{|}~ or in C code: isprint(c) && !isspace(c) && !iscntrl(c) && !isalpha(i) && !isdigit(i) */ FQDEL [\!\"\#\$\%\&\'\(\)\*\+\,\-\.\/\:\;\<\=\>\?\@\[\\\]\^\_\`\{\|\}\~] FQDELN [^\!\"\#\$\%\&\'\(\)\*\+\,\-\.\/\:\;\<\=\>\?\@\[\\\]\^\_\`\{\|\}\~] @@ -354,7 +354,7 @@ nibble = (unsigned char)(hex - 'a' + 10); else if (hex >= 'A' && hex <= 'F') nibble = (unsigned char)(hex - 'A' + 10); - else + else nibble = -1; return nibble; } Index: ossp-pkg/cfg/cfg_test.c RCS File: /v/ossp/cvs/ossp-pkg/cfg/cfg_test.c,v rcsdiff -q -kk '-r1.8' '-r1.9' -u '/v/ossp/cvs/ossp-pkg/cfg/cfg_test.c,v' 2>/dev/null --- cfg_test.c 2002/07/24 10:04:15 1.8 +++ cfg_test.c 2002/11/10 12:12:23 1.9 @@ -6,7 +6,7 @@ #include "cfg.h" #include "cfg_util.h" -int main(int argc, char *argv[]) +int main(int argc, char *argv[]) { cfg_rc_t rc; char *im_ptr; Index: ossp-pkg/cfg/cfg_test.cfg RCS File: /v/ossp/cvs/ossp-pkg/cfg/cfg_test.cfg,v rcsdiff -q -kk '-r1.1' '-r1.2' -u '/v/ossp/cvs/ossp-pkg/cfg/cfg_test.cfg,v' 2>/dev/null --- cfg_test.cfg 2002/08/02 19:07:12 1.1 +++ cfg_test.cfg 2002/11/10 12:12:23 1.2 @@ -28,8 +28,8 @@ foo3/*bar*/ # fails "foo4"/*bar*/ # works again ; -/* a C/C++ style block comment which - goes over multiple lines and even includes +/* a C/C++ style block comment which + goes over multiple lines and even includes some special / * ** * / characters and a nested /* co/**/mment */, too. */