Fix incorrect enum types in config.c that throw warnings under clang.

Found by Douglas J Hunley.

doc/xml/release.xml

@@ -12,6 +12,20 @@
     </intro>
 
     <release-list>
+        <release date="XXXX-XX-XX" version="2.01dev" title="UNDER DEVELOPMENT">
+            <release-core-list>
+                <release-development-list>
+                    <release-item>
+                        <release-item-contributor-list>
+                            <release-item-ideator id="hunley.douglas"/>
+                        </release-item-contributor-list>
+
+                        <p>Fix incorrect enum types in <file>config.c</file> that throw warnings under clang.</p>
+                    </release-item>
+                </release-development-list>
+            </release-core-list>
+        </release>
+
         <release date="2018-02-23" version="2.00" title="Performance Improvements for Archive Push">
             <release-core-list>
                 <release-feature-list>
@@ -4099,6 +4113,11 @@
             <contributor-id type="github">crunchyjohn</contributor-id>
         </contributor>
 
+        <contributor id="hunley.douglas">
+            <contributor-name-display>Douglas J Hunley</contributor-name-display>
+            <contributor-id type="github">hunleyd</contributor-id>
+        </contributor>
+
         <contributor id="james.craig">
             <contributor-name-display>Craig A. James</contributor-name-display>
             <contributor-id type="github">cjames53</contributor-id>

lib/pgBackRest/Version.pm

@@ -39,7 +39,7 @@ push @EXPORT, qw(backrestBin backrestBinSet);
 # Defines the current version of the BackRest executable.  The version number is used to track features but does not affect what
 # repositories or manifests can be read - that's the job of the format number.
 #-----------------------------------------------------------------------------------------------------------------------------------
-use constant BACKREST_VERSION                                       => '2.00';
+use constant BACKREST_VERSION                                       => '2.01dev';
     push @EXPORT, qw(BACKREST_VERSION);
 
 # Format Format Number

libc/lib/pgBackRest/LibCAuto.pm

@@ -6,7 +6,7 @@ package pgBackRest::LibCAuto;
 # Library version (.999 indicates development version)
 sub libcAutoVersion
 {
-    return '2.00';
+    return '2.01.999';
 }
 
 # Configuration option value constants

src/config/config.c

@@ -461,14 +461,14 @@ cfgOptionResetSet(ConfigOption optionId, bool reset)
 Get and set config options
 ***********************************************************************************************************************************/
 const Variant *
-cfgOption(ConfigSource optionId)
+cfgOption(ConfigOption optionId)
 {
     cfgOptionCheck(optionId);
     return configOptionValue[optionId].value;
 }
 
 bool
-cfgOptionBool(ConfigSource optionId)
+cfgOptionBool(ConfigOption optionId)
 {
     cfgOptionCheck(optionId);
 
@@ -479,7 +479,7 @@ cfgOptionBool(ConfigSource optionId)
 }
 
 double
-cfgOptionDbl(ConfigSource optionId)
+cfgOptionDbl(ConfigOption optionId)
 {
     cfgOptionCheck(optionId);
 
@@ -490,7 +490,7 @@ cfgOptionDbl(ConfigSource optionId)
 }
 
 int
-cfgOptionInt(ConfigSource optionId)
+cfgOptionInt(ConfigOption optionId)
 {
     cfgOptionCheck(optionId);
 
@@ -501,7 +501,7 @@ cfgOptionInt(ConfigSource optionId)
 }
 
 int64
-cfgOptionInt64(ConfigSource optionId)
+cfgOptionInt64(ConfigOption optionId)
 {
     cfgOptionCheck(optionId);
 
@@ -512,7 +512,7 @@ cfgOptionInt64(ConfigSource optionId)
 }
 
 const KeyValue *
-cfgOptionKv(ConfigSource optionId)
+cfgOptionKv(ConfigOption optionId)
 {
     cfgOptionCheck(optionId);
 
@@ -523,7 +523,7 @@ cfgOptionKv(ConfigSource optionId)
 }
 
 const VariantList *
-cfgOptionLst(ConfigSource optionId)
+cfgOptionLst(ConfigOption optionId)
 {
     cfgOptionCheck(optionId);
 
@@ -542,7 +542,7 @@ cfgOptionLst(ConfigSource optionId)
 }
 
 const String *
-cfgOptionStr(ConfigSource optionId)
+cfgOptionStr(ConfigOption optionId)
 {
     cfgOptionCheck(optionId);
 
@@ -650,7 +650,7 @@ cfgOptionSet(ConfigOption optionId, ConfigSource source, const Variant *value)
 How was the option set (default, param, config)?
 ***********************************************************************************************************************************/
 ConfigSource
-cfgOptionSource(ConfigSource optionId)
+cfgOptionSource(ConfigOption optionId)
 {
     cfgOptionCheck(optionId);
     return configOptionValue[optionId].source;

src/config/config.h

@@ -38,26 +38,26 @@ void cfgCommandSet(ConfigCommand commandParam);
 const String *cfgExe();
 void cfgExeSet(const String *exeParam);
 
-const Variant *cfgOption(ConfigSource optionId);
-bool cfgOptionBool(ConfigSource optionId);
+const Variant *cfgOption(ConfigOption optionId);
+bool cfgOptionBool(ConfigOption optionId);
 const Variant *cfgOptionDefault(ConfigOption optionId);
 void cfgOptionDefaultSet(ConfigOption optionId, const Variant *defaultValue);
 ConfigDefineOption cfgOptionDefIdFromId(ConfigOption optionId);
-double cfgOptionDbl(ConfigSource optionId);
+double cfgOptionDbl(ConfigOption optionId);
 int cfgOptionId(const char *optionName);
 ConfigOption cfgOptionIdFromDefId(ConfigDefineOption optionDefId, int index);
 int cfgOptionIndex(ConfigOption optionId);
 int cfgOptionIndexTotal(ConfigOption optionDefId);
-int cfgOptionInt(ConfigSource optionId);
-int64 cfgOptionInt64(ConfigSource optionId);
-const KeyValue *cfgOptionKv(ConfigSource optionId);
-const VariantList *cfgOptionLst(ConfigSource optionId);
+int cfgOptionInt(ConfigOption optionId);
+int64 cfgOptionInt64(ConfigOption optionId);
+const KeyValue *cfgOptionKv(ConfigOption optionId);
+const VariantList *cfgOptionLst(ConfigOption optionId);
 const char *cfgOptionName(ConfigOption optionId);
 bool cfgOptionNegate(ConfigOption optionId);
 bool cfgOptionReset(ConfigOption optionId);
 void cfgOptionResetSet(ConfigOption optionId, bool reset);
-ConfigSource cfgOptionSource(ConfigSource optionId);
-const String *cfgOptionStr(ConfigSource optionId);
+ConfigSource cfgOptionSource(ConfigOption optionId);
+const String *cfgOptionStr(ConfigOption optionId);
 bool cfgOptionValid(ConfigOption optionId);
 
 void cfgOptionNegateSet(ConfigOption optionId, bool negate);

src/version.h

@@ -17,6 +17,6 @@ Standard binary name
 /***********************************************************************************************************************************
 Version of the software.  Currently this value is maintained in Version.pm and updated by test.pl.
 ***********************************************************************************************************************************/
-#define PGBACKREST_VERSION                                          "2.00"
+#define PGBACKREST_VERSION                                          "2.01dev"
 
 #endif