Index: ossp-pkg/var/Makefile.in RCS File: /v/ossp/cvs/ossp-pkg/var/Makefile.in,v rcsdiff -q -kk '-r1.3' '-r1.4' -u '/v/ossp/cvs/ossp-pkg/var/Makefile.in,v' 2>/dev/null --- Makefile.in 2002/02/05 19:55:42 1.3 +++ Makefile.in 2002/02/27 13:44:16 1.4 @@ -1,9 +1,9 @@ ## -## VAR - OSSP variable expression library. +## OSSP var -- Variable Expansion ## Copyright (c) 2001-2002 The OSSP Project (http://www.ossp.org/) ## Copyright (c) 2001-2002 Cable & Wireless Deutschland (http://www.cw.com/de/) ## -## This file is part of OSSP VAR, an extensible data serialization +## This file is part of OSSP var, a variable expansion ## library which can be found at http://www.ossp.org/pkg/var/. ## ## Permission to use, copy, modify, and distribute this software for Index: ossp-pkg/var/VERSION RCS File: /v/ossp/cvs/ossp-pkg/var/VERSION,v rcsdiff -q -kk '-r1.1' '-r1.2' -u '/v/ossp/cvs/ossp-pkg/var/VERSION,v' 2>/dev/null --- VERSION 2001/11/20 20:02:21 1.1 +++ VERSION 2002/02/27 13:44:16 1.2 @@ -1,6 +1,6 @@ - VERSION -- Version Information for OSSP VAR (syntax: Text) + VERSION -- Version Information for OSSP var (syntax: Text) [automatically generated and maintained by GNU shtool] - This is OSSP VAR, Version 0.1.0 (20-Nov-2001) + This is OSSP var, Version 0.1.0 (20-Nov-2001) Index: ossp-pkg/var/aclocal.m4 RCS File: /v/ossp/cvs/ossp-pkg/var/aclocal.m4,v rcsdiff -q -kk '-r1.1' '-r1.2' -u '/v/ossp/cvs/ossp-pkg/var/aclocal.m4,v' 2>/dev/null --- aclocal.m4 2002/01/30 19:37:14 1.1 +++ aclocal.m4 2002/02/27 13:44:16 1.2 @@ -1,11 +1,10 @@ dnl ## -dnl ## val - OSSP Value Library -dnl ## Copyright (c) 2002 Ralf S. Engelschall -dnl ## Copyright (c) 2002 The OSSP Project -dnl ## Copyright (c) 2002 Cable & Wireless Deutschland +dnl ## OSSP val -- Variable Expansion +dnl ## Copyright (c) 2001-2002 The OSSP Project +dnl ## Copyright (c) 2001-2002 Cable & Wireless Deutschland dnl ## -dnl ## This file is part of OSSP val, a Value library which -dnl ## can be found at http://www.ossp.org/pkg/val/. +dnl ## This file is part of OSSP var, a variable expansion +dnl ## which can be found at http://www.ossp.org/pkg/var/. dnl ## dnl ## Permission to use, copy, modify, and distribute this software for dnl ## any purpose with or without fee is hereby granted, provided that Index: ossp-pkg/var/configure.ac RCS File: /v/ossp/cvs/ossp-pkg/var/configure.ac,v rcsdiff -q -kk '-r1.5' '-r1.6' -u '/v/ossp/cvs/ossp-pkg/var/configure.ac,v' 2>/dev/null --- configure.ac 2002/01/31 09:09:31 1.5 +++ configure.ac 2002/02/27 13:44:16 1.6 @@ -1,9 +1,9 @@ dnl ## -dnl ## VAR - OSSP variable expression library. +dnl ## OSSP var -- Variable Expansion dnl ## Copyright (c) 2001-2002 The OSSP Project (http://www.ossp.org/) dnl ## Copyright (c) 2001-2002 Cable & Wireless Deutschland (http://www.cw.com/de/) dnl ## -dnl ## This file is part of OSSP VAR, an extensible data serialization +dnl ## This file is part of OSSP var, a variable expansion dnl ## library which can be found at http://www.ossp.org/pkg/var/. dnl ## dnl ## Permission to use, copy, modify, and distribute this software for Index: ossp-pkg/var/var-config.in RCS File: /v/ossp/cvs/ossp-pkg/var/var-config.in,v rcsdiff -q -kk '-r1.2' '-r1.3' -u '/v/ossp/cvs/ossp-pkg/var/var-config.in,v' 2>/dev/null --- var-config.in 2002/01/02 17:12:18 1.2 +++ var-config.in 2002/02/27 13:44:16 1.3 @@ -1,10 +1,10 @@ #!/bin/sh ## -## VAR - OSSP variable expression library. +## OSSP var -- Variable Expansion ## Copyright (c) 2001-2002 The OSSP Project (http://www.ossp.org/) ## Copyright (c) 2001-2002 Cable & Wireless Deutschland (http://www.cw.com/de/) ## -## This file is part of OSSP VAR, an extensible data serialization +## This file is part of OSSP var, a variable expansion ## library which can be found at http://www.ossp.org/pkg/var/. ## ## Permission to use, copy, modify, and distribute this software for Index: ossp-pkg/var/var-config.pod RCS File: /v/ossp/cvs/ossp-pkg/var/var-config.pod,v rcsdiff -q -kk '-r1.2' '-r1.3' -u '/v/ossp/cvs/ossp-pkg/var/var-config.pod,v' 2>/dev/null --- var-config.pod 2002/01/02 17:12:18 1.2 +++ var-config.pod 2002/02/27 13:44:16 1.3 @@ -1,9 +1,9 @@ ## -## VAR - OSSP variable expression library. +## OSSP var -- Variable Expansion ## Copyright (c) 2001-2002 The OSSP Project (http://www.ossp.org/) ## Copyright (c) 2001-2002 Cable & Wireless Deutschland (http://www.cw.com/de/) ## -## This file is part of OSSP VAR, an extensible data serialization +## This file is part of OSSP var, a variable expansion ## library which can be found at http://www.ossp.org/pkg/var/. ## ## Permission to use, copy, modify, and distribute this software for Index: ossp-pkg/var/var.c RCS File: /v/ossp/cvs/ossp-pkg/var/var.c,v rcsdiff -q -kk '-r1.60' '-r1.61' -u '/v/ossp/cvs/ossp-pkg/var/var.c,v' 2>/dev/null --- var.c 2002/01/30 19:37:14 1.60 +++ var.c 2002/02/27 13:44:16 1.61 @@ -1,9 +1,9 @@ /* -** VAR - OSSP variable expression library. +** OSSP var - Variable Expansion ** Copyright (c) 2001-2002 The OSSP Project (http://www.ossp.org/) ** Copyright (c) 2001-2002 Cable & Wireless Deutschland (http://www.cw.com/de/) ** -** This file is part of OSSP VAR, an extensible data serialization +** This file is part of OSSP var, a variable expansion ** library which can be found at http://www.ossp.org/pkg/var/. ** ** Permission to use, copy, modify, and distribute this software for @@ -24,7 +24,7 @@ ** OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF ** SUCH DAMAGE. ** -** var.c: VAR library implementation. +** var.c: library implementation */ #ifdef HAVE_CONFIG_H @@ -74,50 +74,49 @@ const char *var_strerror(var_rc_t rc) { static char *var_errors[] = { - "OK", /* VAR_OK = 0 */ - "incomplete named character", /* VAR_ERR_INCOMPLETE_NAMED_CHARACTER = -1 */ - "incomplete hex", /* VAR_ERR_INCOMPLETE_HEX = -2 */ - "invalid hex", /* VAR_ERR_INVALID_HEX = -3 */ - "octal too large", /* VAR_ERR_OCTAL_TOO_LARGE = -4 */ - "invalid octal", /* VAR_ERR_INVALID_OCTAL = -5 */ - "incomplete octal", /* VAR_ERR_INCOMPLETE_OCTAL = -6 */ - "incomplete grouped hex", /* VAR_ERR_INCOMPLETE_GROUPED_HEX = -7 */ - "incorrect character class specification", /* VAR_ERR_INCORRECT_CLASS_SPEC = -8 */ - "var_expand() configuration is inconsistent", /* VAR_ERR_INVALID_CONFIGURATION = -9 */ - "out of memory", /* VAR_ERR_OUT_OF_MEMORY = -10 */ - "incomplete variable", /* VAR_ERR_INCOMPLETE_VARIABLE_SPEC = -11 */ - "undefined variable", /* VAR_ERR_UNDEFINED_VARIABLE = -12 */ - "input is neither text nor variable", /* VAR_ERR_INPUT_ISNT_TEXT_NOR_VARIABLE = -13 */ - "unknown command in variable", /* VAR_ERR_UNKNOWN_COMMAND_CHAR = -14 */ - "unknown error", /* -15 is not used */ - "malformated search and replace operation", /* VAR_ERR_MALFORMATTED_REPLACE = -16 */ - "unknown flag specified in search and replace operation", /* VAR_ERR_UNKNOWN_REPLACE_FLAG = -17 */ - "invalid regular expression in search and replace operation", /* VAR_ERR_INVALID_REGEX_IN_REPLACE = -18 */ - "missing parameter in command", /* VAR_ERR_MISSING_PARAMETER_IN_COMMAND = -19 */ - "empty search string in search and replace operation", /* VAR_ERR_EMPTY_SEARCH_STRING = -20 */ - "start offset missing in cut operation", /* VAR_ERR_MISSING_START_OFFSET = -21 */ - "offsets in cut operation delimited by unknown character", /* VAR_ERR_INVALID_OFFSET_DELIMITER = -22 */ - "range in cut operation is out of bounds", /* VAR_ERR_RANGE_OUT_OF_BOUNDS = -23 */ - "offset in cut operation is out of bounds", /* VAR_ERR_OFFSET_OUT_OF_BOUNDS = -24 */ - "logic error in cut operation", /* VAR_ERR_OFFSET_LOGIC = -25 */ - "malformatted transpose operation", /* VAR_ERR_MALFORMATTED_TRANSPOSE = -26 */ - "source class does not match destination class in transpose operation", /* VAR_ERR_TRANSPOSE_CLASSES_MISMATCH = -27 */ - "empty character class in transpose operation", /* VAR_ERR_EMPTY_TRANSPOSE_CLASS = -28 */ - "incorrect character class in transpose operation", /* VAR_ERR_INCORRECT_TRANSPOSE_CLASS_SPEC = -29 */ - "malformatted padding operation", /* VAR_ERR_MALFORMATTED_PADDING = -30 */ - "width parameter missing in padding operation", /* VAR_ERR_MISSING_PADDING_WIDTH = -31 */ - "fill string missing in padding operation", /* VAR_ERR_EMPTY_PADDING_FILL_STRING = -32 */ - "unknown quoted pair in search and replace operation", /* VAR_ERR_UNKNOWN_QUOTED_PAIR_IN_REPLACE = -33 */ - "submatch referred to in replace string does not exist in search string", /* VAR_ERR_SUBMATCH_OUT_OF_RANGE = -34 */ - "invalid argument", /* VAR_ERR_INVALID_ARGUMENT = -35 */ - "incomplete quoted pair", /* VAR_ERR_INCOMPLETE_QUOTED_PAIR = -36 */ - "lookup function does not support variable arrays", /* VAR_ERR_ARRAY_LOOKUPS_ARE_UNSUPPORTED = -37 */ - "index specification of array variable contains an invalid character", /* VAR_ERR_INVALID_CHAR_IN_INDEX_SPEC = -38 */ - "index specification of array variable is incomplete", /* VAR_ERR_INCOMPLETE_INDEX_SPEC = -39 */ - "bracket expression in array variable's index is not closed", /* VAR_ERR_UNCLOSED_BRACKET_IN_INDEX = -40 */ - "division by zero error in index specification", /* VAR_ERR_DIVISION_BY_ZERO_IN_INDEX = -41 */ - "unterminated loop construct", /* VAR_ERR_UNTERMINATED_LOOP_CONSTRUCT = -42 */ - "invalid character in loop limits" /* VAR_ERR_INVALID_CHAR_IN_LOOP_LIMITS = -43 */ + "everything ok", /* VAR_OK = 0 */ + "incomplete named character", /* VAR_ERR_INCOMPLETE_NAMED_CHARACTER */ + "incomplete hexadecimal value", /* VAR_ERR_INCOMPLETE_HEX */ + "invalid hexadecimal value", /* VAR_ERR_INVALID_HEX */ + "octal value too large", /* VAR_ERR_OCTAL_TOO_LARGE */ + "invalid octal value", /* VAR_ERR_INVALID_OCTAL */ + "incomplete octal value", /* VAR_ERR_INCOMPLETE_OCTAL */ + "incomplete grouped hexadecimal value", /* VAR_ERR_INCOMPLETE_GROUPED_HEX */ + "incorrect character class specification", /* VAR_ERR_INCORRECT_CLASS_SPEC */ + "invalid expansion configuration", /* VAR_ERR_INVALID_CONFIGURATION */ + "out of memory", /* VAR_ERR_OUT_OF_MEMORY */ + "incomplete variable specification", /* VAR_ERR_INCOMPLETE_VARIABLE_SPEC */ + "undefined variable", /* VAR_ERR_UNDEFINED_VARIABLE */ + "input is neither text nor variable", /* VAR_ERR_INPUT_ISNT_TEXT_NOR_VARIABLE */ + "unknown command character in variable", /* VAR_ERR_UNKNOWN_COMMAND_CHAR */ + "malformated search and replace operation", /* VAR_ERR_MALFORMATTED_REPLACE */ + "unknown flag in search and replace operation", /* VAR_ERR_UNKNOWN_REPLACE_FLAG */ + "invalid regular expression in search and replace operation", /* VAR_ERR_INVALID_REGEX_IN_REPLACE */ + "missing parameter in command", /* VAR_ERR_MISSING_PARAMETER_IN_COMMAND */ + "empty search string in search and replace operation", /* VAR_ERR_EMPTY_SEARCH_STRING */ + "start offset missing in cut operation", /* VAR_ERR_MISSING_START_OFFSET */ + "offsets in cut operation delimited by unknown character", /* VAR_ERR_INVALID_OFFSET_DELIMITER */ + "range out of bounds in cut operation", /* VAR_ERR_RANGE_OUT_OF_BOUNDS */ + "offset out of bounds in cut operation", /* VAR_ERR_OFFSET_OUT_OF_BOUNDS */ + "logic error in cut operation", /* VAR_ERR_OFFSET_LOGIC */ + "malformatted transpose operation", /* VAR_ERR_MALFORMATTED_TRANSPOSE */ + "source and destination classes do not match in transpose operation", /* VAR_ERR_TRANSPOSE_CLASSES_MISMATCH */ + "empty character class in transpose operation", /* VAR_ERR_EMPTY_TRANSPOSE_CLASS */ + "incorrect character class in transpose operation", /* VAR_ERR_INCORRECT_TRANSPOSE_CLASS_SPEC */ + "malformatted padding operation", /* VAR_ERR_MALFORMATTED_PADDING */ + "width parameter missing in padding operation", /* VAR_ERR_MISSING_PADDING_WIDTH */ + "fill string missing in padding operation", /* VAR_ERR_EMPTY_PADDING_FILL_STRING */ + "unknown quoted pair in search and replace operation", /* VAR_ERR_UNKNOWN_QUOTED_PAIR_IN_REPLACE */ + "sub-matching reference out of range", /* VAR_ERR_SUBMATCH_OUT_OF_RANGE */ + "invalid argument", /* VAR_ERR_INVALID_ARGUMENT */ + "incomplete quoted pair", /* VAR_ERR_INCOMPLETE_QUOTED_PAIR */ + "lookup function does not support variable arrays", /* VAR_ERR_ARRAY_LOOKUPS_ARE_UNSUPPORTED */ + "index specification of array variable contains an invalid character", /* VAR_ERR_INVALID_CHAR_IN_INDEX_SPEC */ + "index specification of array variable is incomplete", /* VAR_ERR_INCOMPLETE_INDEX_SPEC */ + "bracket expression in array variable's index is not closed", /* VAR_ERR_UNCLOSED_BRACKET_IN_INDEX */ + "division by zero error in index specification", /* VAR_ERR_DIVISION_BY_ZERO_IN_INDEX */ + "unterminated loop construct", /* VAR_ERR_UNTERMINATED_LOOP_CONSTRUCT */ + "invalid character in loop limits" /* VAR_ERR_INVALID_CHAR_IN_LOOP_LIMITS */ }; rc = 0 - rc; Index: ossp-pkg/var/var.h RCS File: /v/ossp/cvs/ossp-pkg/var/var.h,v rcsdiff -q -kk '-r1.22' '-r1.23' -u '/v/ossp/cvs/ossp-pkg/var/var.h,v' 2>/dev/null --- var.h 2002/01/30 19:37:14 1.22 +++ var.h 2002/02/27 13:44:16 1.23 @@ -1,9 +1,9 @@ /* -** VAR - OSSP variable expression library. +** OSSP var - Variable Expansion ** Copyright (c) 2001-2002 The OSSP Project (http://www.ossp.org/) ** Copyright (c) 2001-2002 Cable & Wireless Deutschland (http://www.cw.com/de/) ** -** This file is part of OSSP VAR, an extensible data serialization +** This file is part of OSSP var, a variable expansion ** library which can be found at http://www.ossp.org/pkg/var/. ** ** Permission to use, copy, modify, and distribute this software for @@ -24,7 +24,7 @@ ** OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF ** SUCH DAMAGE. ** -** var.h: VAR library API +** var.h: library API */ #ifndef __VAR_H__ @@ -32,69 +32,66 @@ #include -/* Error codes returned by the varexp library. */ - +/* Error codes */ typedef enum { - VAR_ERR_CALLBACK = -64, - VAR_ERR_INVALID_CHAR_IN_LOOP_LIMITS = -43, - VAR_ERR_UNTERMINATED_LOOP_CONSTRUCT = -42, - VAR_ERR_DIVISION_BY_ZERO_IN_INDEX = -41, - VAR_ERR_UNCLOSED_BRACKET_IN_INDEX = -40, - VAR_ERR_INCOMPLETE_INDEX_SPEC = -39, - VAR_ERR_INVALID_CHAR_IN_INDEX_SPEC = -38, - VAR_ERR_ARRAY_LOOKUPS_ARE_UNSUPPORTED = -37, - VAR_ERR_INCOMPLETE_QUOTED_PAIR = -36, - VAR_ERR_INVALID_ARGUMENT = -35, - VAR_ERR_SUBMATCH_OUT_OF_RANGE = -34, - VAR_ERR_UNKNOWN_QUOTED_PAIR_IN_REPLACE = -33, - VAR_ERR_EMPTY_PADDING_FILL_STRING = -32, - VAR_ERR_MISSING_PADDING_WIDTH = -31, - VAR_ERR_MALFORMATTED_PADDING = -30, - VAR_ERR_INCORRECT_TRANSPOSE_CLASS_SPEC = -29, - VAR_ERR_EMPTY_TRANSPOSE_CLASS = -28, - VAR_ERR_TRANSPOSE_CLASSES_MISMATCH = -27, - VAR_ERR_MALFORMATTED_TRANSPOSE = -26, - VAR_ERR_OFFSET_LOGIC = -25, - VAR_ERR_OFFSET_OUT_OF_BOUNDS = -24, - VAR_ERR_RANGE_OUT_OF_BOUNDS = -23, - VAR_ERR_INVALID_OFFSET_DELIMITER = -22, - VAR_ERR_MISSING_START_OFFSET = -21, - VAR_ERR_EMPTY_SEARCH_STRING = -20, - VAR_ERR_MISSING_PARAMETER_IN_COMMAND = -19, - VAR_ERR_INVALID_REGEX_IN_REPLACE = -18, - VAR_ERR_UNKNOWN_REPLACE_FLAG = -17, - VAR_ERR_MALFORMATTED_REPLACE = -16, - VAR_ERR_UNKNOWN_COMMAND_CHAR = -14, - VAR_ERR_INPUT_ISNT_TEXT_NOR_VARIABLE = -13, - VAR_ERR_UNDEFINED_VARIABLE = -12, - VAR_ERR_INCOMPLETE_VARIABLE_SPEC = -11, - VAR_ERR_OUT_OF_MEMORY = -10, - VAR_ERR_INVALID_CONFIGURATION = -9, - VAR_ERR_INCORRECT_CLASS_SPEC = -8, - VAR_ERR_INCOMPLETE_GROUPED_HEX = -7, - VAR_ERR_INCOMPLETE_OCTAL = -6, - VAR_ERR_INVALID_OCTAL = -5, - VAR_ERR_OCTAL_TOO_LARGE = -4, - VAR_ERR_INVALID_HEX = -3, - VAR_ERR_INCOMPLETE_HEX = -2, - VAR_ERR_INCOMPLETE_NAMED_CHARACTER = -1, + VAR_ERR_CALLBACK = -64, + VAR_ERR_INVALID_CHAR_IN_LOOP_LIMITS = -42, + VAR_ERR_UNTERMINATED_LOOP_CONSTRUCT = -41, + VAR_ERR_DIVISION_BY_ZERO_IN_INDEX = -40, + VAR_ERR_UNCLOSED_BRACKET_IN_INDEX = -39, + VAR_ERR_INCOMPLETE_INDEX_SPEC = -37, + VAR_ERR_INVALID_CHAR_IN_INDEX_SPEC = -36, + VAR_ERR_ARRAY_LOOKUPS_ARE_UNSUPPORTED = -35, + VAR_ERR_INCOMPLETE_QUOTED_PAIR = -34, + VAR_ERR_INVALID_ARGUMENT = -34, + VAR_ERR_SUBMATCH_OUT_OF_RANGE = -33, + VAR_ERR_UNKNOWN_QUOTED_PAIR_IN_REPLACE = -32, + VAR_ERR_EMPTY_PADDING_FILL_STRING = -31, + VAR_ERR_MISSING_PADDING_WIDTH = -30, + VAR_ERR_MALFORMATTED_PADDING = -29, + VAR_ERR_INCORRECT_TRANSPOSE_CLASS_SPEC = -28, + VAR_ERR_EMPTY_TRANSPOSE_CLASS = -27, + VAR_ERR_TRANSPOSE_CLASSES_MISMATCH = -26, + VAR_ERR_MALFORMATTED_TRANSPOSE = -25, + VAR_ERR_OFFSET_LOGIC = -24, + VAR_ERR_OFFSET_OUT_OF_BOUNDS = -23, + VAR_ERR_RANGE_OUT_OF_BOUNDS = -22, + VAR_ERR_INVALID_OFFSET_DELIMITER = -21, + VAR_ERR_MISSING_START_OFFSET = -20, + VAR_ERR_EMPTY_SEARCH_STRING = -19, + VAR_ERR_MISSING_PARAMETER_IN_COMMAND = -18, + VAR_ERR_INVALID_REGEX_IN_REPLACE = -17, + VAR_ERR_UNKNOWN_REPLACE_FLAG = -16, + VAR_ERR_MALFORMATTED_REPLACE = -15, + VAR_ERR_UNKNOWN_COMMAND_CHAR = -14, + VAR_ERR_INPUT_ISNT_TEXT_NOR_VARIABLE = -13, + VAR_ERR_UNDEFINED_VARIABLE = -12, + VAR_ERR_INCOMPLETE_VARIABLE_SPEC = -11, + VAR_ERR_OUT_OF_MEMORY = -10, + VAR_ERR_INVALID_CONFIGURATION = -9, + VAR_ERR_INCORRECT_CLASS_SPEC = -8, + VAR_ERR_INCOMPLETE_GROUPED_HEX = -7, + VAR_ERR_INCOMPLETE_OCTAL = -6, + VAR_ERR_INVALID_OCTAL = -5, + VAR_ERR_OCTAL_TOO_LARGE = -4, + VAR_ERR_INVALID_HEX = -3, + VAR_ERR_INCOMPLETE_HEX = -2, + VAR_ERR_INCOMPLETE_NAMED_CHARACTER = -1, VAR_OK = 0 } var_rc_t; /* Expand quoted pairs to their binary representation. */ - -var_rc_t var_unescape(const char *src, size_t len, char *dst, - int unescape_all); +var_rc_t var_unescape(const char *src, size_t len, char *dst, int unescape_all); /* Prototype for the lookup callback used in var_expand(). */ - -typedef var_rc_t (*var_cb_t) (void *context, +typedef var_rc_t (*var_cb_t)( + void *context, const char *varname, size_t name_len, int idx, const char **data, size_t *data_len, - size_t *buffer_size); + size_t *buffer_size +); /* Configure the var_expand() parser's tokens. */ - typedef struct { char varinit; /* '$' */ char startdelim; /* '{' */ @@ -105,20 +102,20 @@ char escape; /* '\' */ char *namechars; /* 'a-zA-Z0-9_' */ } var_config_t; + +/* The default configuration */ extern const var_config_t var_config_default; /* Expand variable expressions in a text buffer. */ - var_rc_t var_expand(const char *input, size_t input_len, - char **result, size_t *result_len, - var_cb_t lookup, void *lookup_context, - const var_config_t *config, int force_expand); + char **result, size_t *result_len, + var_cb_t lookup, void *lookup_context, + const var_config_t *config, int force_expand); /* Map an error code to a text message. */ - const char *var_strerror(var_rc_t rc); -/* unique library identifier */ +/* Unique library identifier. */ extern const char var_id[]; #endif /* __VAR_H__ */ Index: ossp-pkg/var/var.pod RCS File: /v/ossp/cvs/ossp-pkg/var/var.pod,v rcsdiff -q -kk '-r1.19' '-r1.20' -u '/v/ossp/cvs/ossp-pkg/var/var.pod,v' 2>/dev/null --- var.pod 2002/02/27 11:55:26 1.19 +++ var.pod 2002/02/27 13:44:16 1.20 @@ -1,5 +1,5 @@ ## -## VAR - OSSP variable expression library. +## OSSP var -- Variable Expansion ## Copyright (c) 2001-2002 The OSSP Project (http://www.ossp.org/) ## Copyright (c) 2001-2002 Cable & Wireless Deutschland (http://www.cw.com/de/) ## @@ -31,7 +31,7 @@ =head1 NAME -var - OSSP variable expression library. +B -- Variable Expansion =head1 SYNOPSIS Index: ossp-pkg/var/var_qref.pod RCS File: /v/ossp/cvs/ossp-pkg/var/Attic/var_qref.pod,v rcsdiff -q -kk '-r1.2' '-r1.3' -u '/v/ossp/cvs/ossp-pkg/var/Attic/var_qref.pod,v' 2>/dev/null --- var_qref.pod 2002/01/08 16:36:40 1.2 +++ var_qref.pod 2002/02/27 13:44:16 1.3 @@ -1,9 +1,9 @@ ## -## VAR - OSSP variable expression library. +## OSSP var -- Variable Expansion ## Copyright (c) 2001-2002 The OSSP Project (http://www.ossp.org/) ## Copyright (c) 2001-2002 Cable & Wireless Deutschland (http://www.cw.com/de/) ## -## This file is part of OSSP VAR, an extensible data serialization +## This file is part of OSSP var, a variable expansion ## library which can be found at http://www.ossp.org/pkg/var/. ## ## Permission to use, copy, modify, and distribute this software for Index: ossp-pkg/var/var_test.c RCS File: /v/ossp/cvs/ossp-pkg/var/var_test.c,v rcsdiff -q -kk '-r1.32' '-r1.33' -u '/v/ossp/cvs/ossp-pkg/var/var_test.c,v' 2>/dev/null --- var_test.c 2002/01/09 11:23:01 1.32 +++ var_test.c 2002/02/27 13:44:16 1.33 @@ -1,9 +1,9 @@ /* -** VAR - OSSP variable expression library. +** OSSP var -- Variable Expansion ** Copyright (c) 2001-2002 The OSSP Project (http://www.ossp.org/) ** Copyright (c) 2001-2002 Cable & Wireless Deutschland (http://www.cw.com/de/) ** -** This file is part of OSSP VAR, an extensible data serialization +** This file is part of OSSP var, a variable expansion ** library which can be found at http://www.ossp.org/pkg/var/. ** ** Permission to use, copy, modify, and distribute this software for @@ -24,7 +24,7 @@ ** OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF ** SUCH DAMAGE. ** -** var_test.c: VAR library regression test. +** var_test.c: library regression test. */ #include