db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-03-05 15:05:48 +02:00
Code Issues Releases Activity

Remove parse.auto.h.

Browse Source 
At one time there was a lot more in this header but it got merged with the enums and constants in config.auto.c, leaving only the ConfigOptionType enum.

Auto-generating the ConfigOptionType enum is not very useful since new option types require code in parse.c.
This commit is contained in:
David Steele 2021-06-07 08:48:09 -04:00
parent 7a449f0e49
commit a76cb57c80
4 changed files with 16 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
build/lib/pgBackRestBuild/Config/BuildParse.pm
View File

@ -27,8 +27,6 @@ use pgBackRestBuild::Config::Data;
####################################################################################################################################
use constant BLDLCL_FILE_DEFINE => 'parse';
use constant BLDLCL_ENUM_OPTION_TYPE => '01-enumOptionType';
use constant BLDLCL_DATA_COMMAND => '01-dataCommand';
use constant BLDLCL_DATA_OPTION_GROUP => '01-dataOptionGroup';
use constant BLDLCL_DATA_OPTION => '02-dataOption';
@ -48,15 +46,6 @@ my $rhBuild =
{
&BLD_SUMMARY => $strSummary,
&BLD_ENUM =>
{
&BLDLCL_ENUM_OPTION_TYPE =>
{
&BLD_SUMMARY => 'Option type',
&BLD_NAME => 'ConfigOptionType',
},
},
&BLD_DATA =>
{
&BLDLCL_DATA_COMMAND =>
@ -228,17 +217,6 @@ sub renderOptional
####################################################################################################################################
sub buildConfigParse
{
# Build option type enum
# ------------------------------------------------------------------------------------------------------------------------------
my $rhEnum = $rhBuild->{&BLD_FILE}{&BLDLCL_FILE_DEFINE}{&BLD_ENUM}{&BLDLCL_ENUM_OPTION_TYPE};
foreach my $strOptionType (cfgDefineOptionTypeList())
{
# Build C enum
my $strOptionTypeEnum = buildConfigDefineOptionTypeEnum($strOptionType);
push(@{$rhEnum->{&BLD_LIST}}, $strOptionTypeEnum);
};
# Build command parse data
# ------------------------------------------------------------------------------------------------------------------------------
my $rhCommandDefine = cfgDefineCommand();

2
src/config/config.intern.h
View File

@ -10,7 +10,7 @@ The general-purpose functions for querying the current configuration are found i
#define CONFIG_CONFIG_INTERN_H
#include "config/config.h"
#include "config/parse.auto.h"
#include "config/parse.h"
/***********************************************************************************************************************************
The maximum number of keys that an indexed option can have, e.g. pg256-path would be the maximum pg-path option

24
src/config/parse.auto.h
View File

@ -1,24 +0,0 @@
/***********************************************************************************************************************************
Config Parse Rules
Automatically generated by Build.pm -- do not modify directly.
***********************************************************************************************************************************/
#ifndef CONFIG_PARSE_AUTO_H
#define CONFIG_PARSE_AUTO_H
/***********************************************************************************************************************************
Option type enum
***********************************************************************************************************************************/
typedef enum
{
cfgOptTypeBoolean,
cfgOptTypeHash,
cfgOptTypeInteger,
cfgOptTypeList,
cfgOptTypePath,
cfgOptTypeSize,
cfgOptTypeString,
cfgOptTypeTime,
} ConfigOptionType;
#endif

16
src/config/parse.h
View File

@ -5,9 +5,23 @@ Parse Configuration
#define CONFIG_PARSE_H
#include "config/config.h"
#include "config/parse.auto.h"
#include "storage/storage.h"
/***********************************************************************************************************************************
Option type enum
***********************************************************************************************************************************/
typedef enum
{
cfgOptTypeBoolean, // Boolean
cfgOptTypeHash, // Associative array, e.g. key1=val1,key2=val2
cfgOptTypeInteger, // Signed 64-bit integer
cfgOptTypeList, // String list, e.g. val1,val2
cfgOptTypePath, // Path string with validation
cfgOptTypeSize, // Size, e.g. 1m, 2gb
cfgOptTypeString, // String
cfgOptTypeTime, // Time in seconds, e.g. 23, 1.5
} ConfigOptionType;
/***********************************************************************************************************************************
Functions
***********************************************************************************************************************************/