1
0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-07-05 00:28:52 +02:00

Remove ConfigDefineCommand enum.

This has always been equivalent to the ConfigCommand enum so it just adds complexity.

It was created for symmetry with ConfigDefineOption, which will also be removed soon.
This commit is contained in:
David Steele
2020-10-19 18:17:47 -04:00
parent ba29e24684
commit 6414ae9707
18 changed files with 1473 additions and 1537 deletions

View File

@ -13,6 +13,7 @@ Common Command Routines
#include "common/time.h"
#include "common/type/json.h"
#include "config/config.h"
#include "config/define.h"
#include "version.h"
/***********************************************************************************************************************************
@ -46,9 +47,6 @@ cmdOption(void)
MEM_CONTEXT_TEMP_BEGIN()
{
// Get command define id used to determine which options are valid for this command
ConfigDefineCommand commandDefId = cfgCommandDefIdFromId(cfgCommand());
// Add command parameters if they exist
const StringList *commandParamList = cfgCommandParam();
@ -78,7 +76,7 @@ cmdOption(void)
// Skip the option if not valid for this command. Generally only one command runs at a time, but sometimes
// commands are chained together (e.g. backup and expire) and the second command may not use all the options of
// the first command. Displaying them is harmless but might cause confusion.
if (!cfgDefOptionValid(commandDefId, cfgOptionDefIdFromId(optionId)))
if (!cfgDefOptionValid(cfgCommand(), cfgOptionDefIdFromId(optionId)))
continue;
// If option was negated