*** pgsql/src/include/access/reloptions.h 2009/02/02 19:31:39 1.12 --- pgsql/src/include/access/reloptions.h 2009/03/23 16:36:27 1.13 *************** *** 11,17 **** * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * ! * $PostgreSQL: pgsql/src/include/access/reloptions.h,v 1.11 2009/01/26 19:41:06 alvherre Exp $ * *------------------------------------------------------------------------- */ --- 11,17 ---- * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * ! * $PostgreSQL: pgsql/src/include/access/reloptions.h,v 1.12 2009/02/02 19:31:39 alvherre Exp $ * *------------------------------------------------------------------------- */ *************** typedef struct relopt_string *** 106,117 **** char default_val[1]; /* variable length, zero-terminated */ } relopt_string; ! /* This is the input type for fillRelOptions */ typedef struct { ! char *optname; ! relopt_type opttype; ! int offset; } relopt_parse_elt; --- 106,117 ---- char default_val[1]; /* variable length, zero-terminated */ } relopt_string; ! /* This is the table datatype for fillRelOptions */ typedef struct { ! const char *optname; /* option's name */ ! relopt_type opttype; /* option's datatype */ ! int offset; /* offset of field in result struct */ } relopt_parse_elt; *************** typedef struct *** 149,156 **** * } * * Note that this is more or less the same that fillRelOptions does, so only ! * use this if you need to do something non-standard within some options' ! * block. */ #define HAVE_RELOPTION(optname, option) \ (pg_strncasecmp(option.gen->name, optname, option.gen->namelen + 1) == 0) --- 149,156 ---- * } * * Note that this is more or less the same that fillRelOptions does, so only ! * use this if you need to do something non-standard within some option's ! * code block. */ #define HAVE_RELOPTION(optname, option) \ (pg_strncasecmp(option.gen->name, optname, option.gen->namelen + 1) == 0) *************** extern relopt_value *parseRelOptions(Dat *** 252,260 **** relopt_kind kind, int *numrelopts); extern void *allocateReloptStruct(Size base, relopt_value *options, int numoptions); ! extern void fillRelOptions(void *rdopts, Size basesize, relopt_value *options, ! int numoptions, bool validate, relopt_parse_elt *elems, ! int nelems); extern bytea *default_reloptions(Datum reloptions, bool validate, relopt_kind kind); --- 252,261 ---- relopt_kind kind, int *numrelopts); extern void *allocateReloptStruct(Size base, relopt_value *options, int numoptions); ! extern void fillRelOptions(void *rdopts, Size basesize, ! relopt_value *options, int numoptions, ! bool validate, ! const relopt_parse_elt *elems, int nelems); extern bytea *default_reloptions(Datum reloptions, bool validate, relopt_kind kind);