diff --git a/build/lib/pgBackRestBuild/Config/BuildHelp.pm b/build/lib/pgBackRestBuild/Config/BuildHelp.pm index 7cc76fa39..693abb429 100644 --- a/build/lib/pgBackRestBuild/Config/BuildHelp.pm +++ b/build/lib/pgBackRestBuild/Config/BuildHelp.pm @@ -57,10 +57,10 @@ my $rhBuild = #################################################################################################################################### # Format pack tag #################################################################################################################################### -use constant PCK_TYPE_ARRAY => 'pckTypeArray'; -use constant PCK_TYPE_BOOL => 'pckTypeBool'; -use constant PCK_TYPE_OBJ => 'pckTypeObj'; -use constant PCK_TYPE_STR => 'pckTypeStr'; +use constant PCK_TYPE_ARRAY => 1; +use constant PCK_TYPE_BOOL => 2; +use constant PCK_TYPE_OBJ => 5; +use constant PCK_TYPE_STR => 7; # Pack an unsigned 64-bit integer to base-128 varint encoding and output to hex. This is a simplified version of # pckWriteUInt64Internal() so see that function for more information. @@ -86,7 +86,7 @@ sub packIntFormat sub packTagFormat { my $strName = shift; - my $strType = shift; + my $iType = shift; my $iDelta = shift; my $xData = shift; my $iIndent = shift; @@ -97,7 +97,7 @@ sub packTagFormat my $iValue = undef; my $iBits = undef; - if ($strType eq PCK_TYPE_STR || $strType eq PCK_TYPE_BOOL) + if ($iType == PCK_TYPE_STR || $iType == PCK_TYPE_BOOL) { $iBits = $iDelta & 0x3; $iDelta >>= 2; @@ -107,7 +107,7 @@ sub packTagFormat $iBits |= 0x4; } - if ($strType eq PCK_TYPE_STR) + if ($iType == PCK_TYPE_STR) { $iBits |= 0x8; $iValue = length($xData); @@ -118,7 +118,7 @@ sub packTagFormat undef($xData); } } - elsif ($strType eq PCK_TYPE_ARRAY || $strType eq PCK_TYPE_OBJ) + elsif ($iType == PCK_TYPE_ARRAY || $iType == PCK_TYPE_OBJ) { $iBits |= $iDelta & 0x7; $iDelta >>= 3; @@ -130,14 +130,7 @@ sub packTagFormat } # Output pack type and bits - my $strResult = "${strIndent}${strType} << 4"; - - if ($iBits != 0) - { - $strResult .= sprintf(" | 0x%02X", $iBits); - } - - $strResult .= ','; + my $strResult = sprintf("${strIndent}0x%02X,", ($iType << 4) | $iBits); # Output additional id delta when present if ($iDelta > 0) diff --git a/doc/xml/release.xml b/doc/xml/release.xml index 450729aaa..cf05ad4a9 100644 --- a/doc/xml/release.xml +++ b/doc/xml/release.xml @@ -13,6 +13,21 @@ + + + + + + + + + + +

Add support for more Pack types.

+ + + + diff --git a/src/command/help/help.auto.c b/src/command/help/help.auto.c index cbae29855..89b55d1e5 100644 --- a/src/command/help/help.auto.c +++ b/src/command/help/help.auto.c @@ -11,14 +11,14 @@ static const unsigned char helpDataPack[] = { // Commands // ----------------------------------------------------------------------------------------------------------------------------- - pckTypeArray << 4, // Commands begin + 0x10, // Commands begin // archive-get command // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x09, 0x23, // Summary + 0x79, 0x23, // Summary 0x47, 0x65, 0x74, 0x20, 0x61, 0x20, 0x57, 0x41, 0x4C, 0x20, 0x73, 0x65, 0x67, 0x6D, 0x65, 0x6E, 0x74, 0x20, 0x66, 0x72, 0x6F, 0x6D, 0x20, 0x74, 0x68, 0x65, 0x20, 0x61, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x2E, - pckTypeStr << 4 | 0x08, 0x95, 0x05, // Description + 0x78, 0x95, 0x05, // Description 0x54, 0x68, 0x69, 0x73, 0x20, 0x63, 0x6F, 0x6D, 0x6D, 0x61, 0x6E, 0x64, 0x20, 0x69, 0x73, 0x20, 0x75, 0x73, 0x65, 0x64, 0x20, 0x62, 0x79, 0x20, 0x50, 0x6F, 0x73, 0x74, 0x67, 0x72, 0x65, 0x53, 0x51, 0x4C, 0x20, 0x74, 0x6F, 0x20, 0x72, 0x65, 0x73, 0x74, 0x6F, 0x72, 0x65, 0x20, 0x61, 0x20, 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x2C, 0x20, 0x70, 0x65, 0x72, 0x66, @@ -56,10 +56,10 @@ static const unsigned char helpDataPack[] = // archive-push command // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x09, 0x22, // Summary + 0x79, 0x22, // Summary 0x50, 0x75, 0x73, 0x68, 0x20, 0x61, 0x20, 0x57, 0x41, 0x4C, 0x20, 0x73, 0x65, 0x67, 0x6D, 0x65, 0x6E, 0x74, 0x20, 0x74, 0x6F, 0x20, 0x74, 0x68, 0x65, 0x20, 0x61, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x2E, - pckTypeStr << 4 | 0x08, 0x8D, 0x04, // Description + 0x78, 0x8D, 0x04, // Description 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x73, 0x20, 0x61, 0x20, 0x57, 0x41, 0x4C, 0x20, 0x73, 0x65, 0x67, 0x6D, 0x65, 0x6E, 0x74, 0x20, 0x66, 0x72, 0x6F, 0x6D, 0x20, 0x50, 0x6F, 0x73, 0x74, 0x67, 0x72, 0x65, 0x53, 0x51, 0x4C, 0x20, 0x61, 0x6E, 0x64, 0x20, 0x61, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x73, 0x20, 0x69, 0x74, 0x20, 0x69, 0x6E, 0x20, 0x65, 0x61, 0x63, @@ -90,10 +90,10 @@ static const unsigned char helpDataPack[] = // backup command // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x09, 0x1A, // Summary + 0x79, 0x1A, // Summary 0x42, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x20, 0x61, 0x20, 0x64, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x20, 0x63, 0x6C, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2E, - pckTypeStr << 4 | 0x08, 0xC1, 0x02, // Description + 0x78, 0xC1, 0x02, // Description 0x57, 0x68, 0x65, 0x6E, 0x20, 0x6D, 0x75, 0x6C, 0x74, 0x69, 0x70, 0x6C, 0x65, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x69, 0x65, 0x73, 0x20, 0x61, 0x72, 0x65, 0x20, 0x63, 0x6F, 0x6E, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x64, 0x2C, 0x20, 0x70, 0x67, 0x42, 0x61, 0x63, 0x6B, 0x52, 0x65, 0x73, 0x74, 0x20, 0x77, 0x69, 0x6C, 0x6C, 0x20, 0x62, @@ -114,10 +114,10 @@ static const unsigned char helpDataPack[] = // check command // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x09, 0x18, // Summary + 0x79, 0x18, // Summary 0x43, 0x68, 0x65, 0x63, 0x6B, 0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 0x6F, 0x6E, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x2E, - pckTypeStr << 4 | 0x08, 0xFF, 0x08, // Description + 0x78, 0xFF, 0x08, // Description 0x54, 0x68, 0x65, 0x20, 0x63, 0x68, 0x65, 0x63, 0x6B, 0x20, 0x63, 0x6F, 0x6D, 0x6D, 0x61, 0x6E, 0x64, 0x20, 0x76, 0x61, 0x6C, 0x69, 0x64, 0x61, 0x74, 0x65, 0x73, 0x20, 0x74, 0x68, 0x61, 0x74, 0x20, 0x70, 0x67, 0x42, 0x61, 0x63, 0x6B, 0x52, 0x65, 0x73, 0x74, 0x20, 0x61, 0x6E, 0x64, 0x20, 0x74, 0x68, 0x65, 0x20, 0x61, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x5F, @@ -179,10 +179,10 @@ static const unsigned char helpDataPack[] = // expire command // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x09, 0x25, // Summary + 0x79, 0x25, // Summary 0x45, 0x78, 0x70, 0x69, 0x72, 0x65, 0x20, 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x73, 0x20, 0x74, 0x68, 0x61, 0x74, 0x20, 0x65, 0x78, 0x63, 0x65, 0x65, 0x64, 0x20, 0x72, 0x65, 0x74, 0x65, 0x6E, 0x74, 0x69, 0x6F, 0x6E, 0x2E, - pckTypeStr << 4 | 0x08, 0xBD, 0x0A, // Description + 0x78, 0xBD, 0x0A, // Description 0x70, 0x67, 0x42, 0x61, 0x63, 0x6B, 0x52, 0x65, 0x73, 0x74, 0x20, 0x64, 0x6F, 0x65, 0x73, 0x20, 0x66, 0x75, 0x6C, 0x6C, 0x20, 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x20, 0x72, 0x6F, 0x74, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x62, 0x61, 0x73, 0x65, 0x64, 0x20, 0x6F, 0x6E, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x74, 0x65, 0x6E, 0x74, 0x69, 0x6F, 0x6E, 0x20, @@ -254,9 +254,9 @@ static const unsigned char helpDataPack[] = // help command // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x09, 0x09, // Summary + 0x79, 0x09, // Summary 0x47, 0x65, 0x74, 0x20, 0x68, 0x65, 0x6C, 0x70, 0x2E, - pckTypeStr << 4 | 0x08, 0xA3, 0x03, // Description + 0x78, 0xA3, 0x03, // Description 0x54, 0x68, 0x72, 0x65, 0x65, 0x20, 0x6C, 0x65, 0x76, 0x65, 0x6C, 0x73, 0x20, 0x6F, 0x66, 0x20, 0x68, 0x65, 0x6C, 0x70, 0x20, 0x61, 0x72, 0x65, 0x20, 0x70, 0x72, 0x6F, 0x76, 0x69, 0x64, 0x65, 0x64, 0x2E, 0x20, 0x49, 0x66, 0x20, 0x6E, 0x6F, 0x20, 0x63, 0x6F, 0x6D, 0x6D, 0x61, 0x6E, 0x64, 0x20, 0x69, 0x73, 0x20, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, @@ -281,10 +281,10 @@ static const unsigned char helpDataPack[] = // info command // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x09, 0x23, // Summary + 0x79, 0x23, // Summary 0x52, 0x65, 0x74, 0x72, 0x69, 0x65, 0x76, 0x65, 0x20, 0x69, 0x6E, 0x66, 0x6F, 0x72, 0x6D, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x61, 0x62, 0x6F, 0x75, 0x74, 0x20, 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x73, 0x2E, - pckTypeStr << 4 | 0x08, 0xC6, 0x16, // Description + 0x78, 0xC6, 0x16, // Description 0x54, 0x68, 0x65, 0x20, 0x69, 0x6E, 0x66, 0x6F, 0x20, 0x63, 0x6F, 0x6D, 0x6D, 0x61, 0x6E, 0x64, 0x20, 0x6F, 0x70, 0x65, 0x72, 0x61, 0x74, 0x65, 0x73, 0x20, 0x6F, 0x6E, 0x20, 0x61, 0x20, 0x73, 0x69, 0x6E, 0x67, 0x6C, 0x65, 0x20, 0x73, 0x74, 0x61, 0x6E, 0x7A, 0x61, 0x20, 0x6F, 0x72, 0x20, 0x61, 0x6C, 0x6C, 0x20, 0x73, 0x74, 0x61, 0x6E, 0x7A, 0x61, 0x73, 0x2E, @@ -436,11 +436,11 @@ static const unsigned char helpDataPack[] = // repo-create command // ------------------------------------------------------------------------------------------------------------------------- - pckTypeBool << 4 | 0x08, // Internal - pckTypeStr << 4 | 0x08, 0x16, // Summary + 0x28, // Internal + 0x78, 0x16, // Summary 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x2E, - pckTypeStr << 4 | 0x08, 0x8C, 0x02, // Description + 0x78, 0x8C, 0x02, // Description 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x20, 0x28, 0x70, 0x61, 0x74, 0x68, 0x2C, 0x20, 0x62, 0x75, 0x63, 0x6B, 0x65, 0x74, 0x2C, 0x20, 0x65, 0x74, 0x63, 0x2E, 0x29, 0x20, 0x6F, 0x6E, 0x20, 0x74, 0x68, 0x65, 0x20, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6C, 0x74, 0x20, 0x72, 0x65, @@ -458,10 +458,10 @@ static const unsigned char helpDataPack[] = // repo-get command // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x09, 0x1D, // Summary + 0x79, 0x1D, // Summary 0x47, 0x65, 0x74, 0x20, 0x61, 0x20, 0x66, 0x69, 0x6C, 0x65, 0x20, 0x66, 0x72, 0x6F, 0x6D, 0x20, 0x61, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x2E, - pckTypeStr << 4 | 0x08, 0xE7, 0x04, // Description + 0x78, 0xE7, 0x04, // Description 0x53, 0x69, 0x6D, 0x69, 0x6C, 0x61, 0x72, 0x20, 0x74, 0x6F, 0x20, 0x74, 0x68, 0x65, 0x20, 0x75, 0x6E, 0x69, 0x78, 0x20, 0x63, 0x61, 0x74, 0x20, 0x63, 0x6F, 0x6D, 0x6D, 0x61, 0x6E, 0x64, 0x20, 0x62, 0x75, 0x74, 0x20, 0x77, 0x6F, 0x72, 0x6B, 0x73, 0x20, 0x6F, 0x6E, 0x20, 0x61, 0x6E, 0x79, 0x20, 0x73, 0x75, 0x70, 0x70, 0x6F, 0x72, 0x74, 0x65, 0x64, 0x20, 0x72, @@ -497,10 +497,10 @@ static const unsigned char helpDataPack[] = // repo-ls command // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x09, 0x1B, // Summary + 0x79, 0x1B, // Summary 0x4C, 0x69, 0x73, 0x74, 0x20, 0x66, 0x69, 0x6C, 0x65, 0x73, 0x20, 0x69, 0x6E, 0x20, 0x61, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x2E, - pckTypeStr << 4 | 0x08, 0xB9, 0x04, // Description + 0x78, 0xB9, 0x04, // Description 0x53, 0x69, 0x6D, 0x69, 0x6C, 0x61, 0x72, 0x20, 0x74, 0x6F, 0x20, 0x74, 0x68, 0x65, 0x20, 0x75, 0x6E, 0x69, 0x78, 0x20, 0x6C, 0x73, 0x20, 0x63, 0x6F, 0x6D, 0x6D, 0x61, 0x6E, 0x64, 0x20, 0x62, 0x75, 0x74, 0x20, 0x77, 0x6F, 0x72, 0x6B, 0x73, 0x20, 0x6F, 0x6E, 0x20, 0x61, 0x6E, 0x79, 0x20, 0x73, 0x75, 0x70, 0x70, 0x6F, 0x72, 0x74, 0x65, 0x64, 0x20, 0x72, 0x65, @@ -534,11 +534,11 @@ static const unsigned char helpDataPack[] = // repo-put command // ------------------------------------------------------------------------------------------------------------------------- - pckTypeBool << 4 | 0x08, // Internal - pckTypeStr << 4 | 0x08, 0x1D, // Summary + 0x28, // Internal + 0x78, 0x1D, // Summary 0x50, 0x75, 0x74, 0x20, 0x61, 0x20, 0x66, 0x69, 0x6C, 0x65, 0x20, 0x69, 0x6E, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x2E, - pckTypeStr << 4 | 0x08, 0xAE, 0x03, // Description + 0x78, 0xAE, 0x03, // Description 0x53, 0x69, 0x6D, 0x69, 0x6C, 0x61, 0x72, 0x20, 0x74, 0x6F, 0x20, 0x74, 0x68, 0x65, 0x20, 0x75, 0x6E, 0x69, 0x78, 0x20, 0x74, 0x65, 0x65, 0x20, 0x63, 0x6F, 0x6D, 0x6D, 0x61, 0x6E, 0x64, 0x20, 0x62, 0x79, 0x20, 0x63, 0x6F, 0x70, 0x79, 0x69, 0x6E, 0x67, 0x20, 0x66, 0x72, 0x6F, 0x6D, 0x20, 0x73, 0x74, 0x64, 0x69, 0x6E, 0x20, 0x74, 0x6F, 0x20, 0x61, 0x20, 0x66, @@ -564,11 +564,11 @@ static const unsigned char helpDataPack[] = // repo-rm command // ------------------------------------------------------------------------------------------------------------------------- - pckTypeBool << 4 | 0x08, // Internal - pckTypeStr << 4 | 0x08, 0x25, // Summary + 0x28, // Internal + 0x78, 0x25, // Summary 0x52, 0x65, 0x6D, 0x6F, 0x76, 0x65, 0x20, 0x70, 0x61, 0x74, 0x68, 0x73, 0x2F, 0x66, 0x69, 0x6C, 0x65, 0x73, 0x20, 0x69, 0x6E, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x2E, - pckTypeStr << 4 | 0x08, 0xBA, 0x03, // Description + 0x78, 0xBA, 0x03, // Description 0x53, 0x69, 0x6D, 0x69, 0x6C, 0x61, 0x72, 0x20, 0x74, 0x6F, 0x20, 0x74, 0x68, 0x65, 0x20, 0x75, 0x6E, 0x69, 0x78, 0x20, 0x72, 0x6D, 0x20, 0x63, 0x6F, 0x6D, 0x6D, 0x61, 0x6E, 0x64, 0x20, 0x62, 0x75, 0x74, 0x20, 0x6F, 0x70, 0x74, 0x69, 0x6F, 0x6E, 0x73, 0x20, 0x61, 0x72, 0x65, 0x20, 0x64, 0x69, 0x66, 0x66, 0x65, 0x72, 0x65, 0x6E, 0x74, 0x2E, 0x20, 0x54, 0x68, @@ -595,10 +595,10 @@ static const unsigned char helpDataPack[] = // restore command // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x09, 0x1B, // Summary + 0x79, 0x1B, // Summary 0x52, 0x65, 0x73, 0x74, 0x6F, 0x72, 0x65, 0x20, 0x61, 0x20, 0x64, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x20, 0x63, 0x6C, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2E, - pckTypeStr << 4 | 0x08, 0xDF, 0x06, // Description + 0x78, 0xDF, 0x06, // Description 0x54, 0x68, 0x65, 0x20, 0x72, 0x65, 0x73, 0x74, 0x6F, 0x72, 0x65, 0x20, 0x63, 0x6F, 0x6D, 0x6D, 0x61, 0x6E, 0x64, 0x20, 0x61, 0x75, 0x74, 0x6F, 0x6D, 0x61, 0x74, 0x69, 0x63, 0x61, 0x6C, 0x6C, 0x79, 0x20, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6C, 0x74, 0x73, 0x20, 0x74, 0x6F, 0x20, 0x73, 0x65, 0x6C, 0x65, 0x63, 0x74, 0x69, 0x6E, 0x67, 0x20, 0x74, 0x68, 0x65, 0x20, @@ -646,10 +646,10 @@ static const unsigned char helpDataPack[] = // stanza-create command // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x09, 0x20, // Summary + 0x79, 0x20, // Summary 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x20, 0x73, 0x74, 0x61, 0x6E, 0x7A, 0x61, 0x20, 0x64, 0x61, 0x74, 0x61, 0x2E, - pckTypeStr << 4 | 0x08, 0xEE, 0x01, // Description + 0x78, 0xEE, 0x01, // Description 0x54, 0x68, 0x65, 0x20, 0x73, 0x74, 0x61, 0x6E, 0x7A, 0x61, 0x2D, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x20, 0x63, 0x6F, 0x6D, 0x6D, 0x61, 0x6E, 0x64, 0x20, 0x6D, 0x75, 0x73, 0x74, 0x20, 0x62, 0x65, 0x20, 0x72, 0x75, 0x6E, 0x20, 0x61, 0x66, 0x74, 0x65, 0x72, 0x20, 0x74, 0x68, 0x65, 0x20, 0x73, 0x74, 0x61, 0x6E, 0x7A, 0x61, 0x20, 0x68, 0x61, 0x73, 0x20, 0x62, @@ -665,9 +665,9 @@ static const unsigned char helpDataPack[] = // stanza-delete command // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x09, 0x10, // Summary + 0x79, 0x10, // Summary 0x44, 0x65, 0x6C, 0x65, 0x74, 0x65, 0x20, 0x61, 0x20, 0x73, 0x74, 0x61, 0x6E, 0x7A, 0x61, 0x2E, - pckTypeStr << 4 | 0x08, 0xBE, 0x06, // Description + 0x78, 0xBE, 0x06, // Description 0x54, 0x68, 0x65, 0x20, 0x73, 0x74, 0x61, 0x6E, 0x7A, 0x61, 0x2D, 0x64, 0x65, 0x6C, 0x65, 0x74, 0x65, 0x20, 0x63, 0x6F, 0x6D, 0x6D, 0x61, 0x6E, 0x64, 0x20, 0x72, 0x65, 0x6D, 0x6F, 0x76, 0x65, 0x73, 0x20, 0x64, 0x61, 0x74, 0x61, 0x20, 0x69, 0x6E, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x20, 0x61, 0x73, 0x73, @@ -716,9 +716,9 @@ static const unsigned char helpDataPack[] = // stanza-upgrade command // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x09, 0x11, // Summary + 0x79, 0x11, // Summary 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x20, 0x61, 0x20, 0x73, 0x74, 0x61, 0x6E, 0x7A, 0x61, 0x2E, - pckTypeStr << 4 | 0x08, 0xD3, 0x02, // Description + 0x78, 0xD3, 0x02, // Description 0x49, 0x6D, 0x6D, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x6C, 0x79, 0x20, 0x61, 0x66, 0x74, 0x65, 0x72, 0x20, 0x75, 0x70, 0x67, 0x72, 0x61, 0x64, 0x69, 0x6E, 0x67, 0x20, 0x50, 0x6F, 0x73, 0x74, 0x67, 0x72, 0x65, 0x53, 0x51, 0x4C, 0x20, 0x74, 0x6F, 0x20, 0x61, 0x20, 0x6E, 0x65, 0x77, 0x65, 0x72, 0x20, 0x6D, 0x61, 0x6A, 0x6F, 0x72, 0x20, 0x76, 0x65, 0x72, 0x73, @@ -739,10 +739,10 @@ static const unsigned char helpDataPack[] = // start command // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x09, 0x22, // Summary + 0x79, 0x22, // Summary 0x41, 0x6C, 0x6C, 0x6F, 0x77, 0x20, 0x70, 0x67, 0x42, 0x61, 0x63, 0x6B, 0x52, 0x65, 0x73, 0x74, 0x20, 0x70, 0x72, 0x6F, 0x63, 0x65, 0x73, 0x73, 0x65, 0x73, 0x20, 0x74, 0x6F, 0x20, 0x72, 0x75, 0x6E, 0x2E, - pckTypeStr << 4 | 0x08, 0xA2, 0x02, // Description + 0x78, 0xA2, 0x02, // Description 0x49, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x70, 0x67, 0x42, 0x61, 0x63, 0x6B, 0x52, 0x65, 0x73, 0x74, 0x20, 0x70, 0x72, 0x6F, 0x63, 0x65, 0x73, 0x73, 0x65, 0x73, 0x20, 0x77, 0x65, 0x72, 0x65, 0x20, 0x70, 0x72, 0x65, 0x76, 0x69, 0x6F, 0x75, 0x73, 0x6C, 0x79, 0x20, 0x73, 0x74, 0x6F, 0x70, 0x70, 0x65, 0x64, 0x20, 0x75, 0x73, 0x69, 0x6E, 0x67, 0x20, 0x74, 0x68, @@ -761,10 +761,10 @@ static const unsigned char helpDataPack[] = // stop command // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x09, 0x27, // Summary + 0x79, 0x27, // Summary 0x53, 0x74, 0x6F, 0x70, 0x20, 0x70, 0x67, 0x42, 0x61, 0x63, 0x6B, 0x52, 0x65, 0x73, 0x74, 0x20, 0x70, 0x72, 0x6F, 0x63, 0x65, 0x73, 0x73, 0x65, 0x73, 0x20, 0x66, 0x72, 0x6F, 0x6D, 0x20, 0x72, 0x75, 0x6E, 0x6E, 0x69, 0x6E, 0x67, 0x2E, - pckTypeStr << 4 | 0x08, 0xCB, 0x02, // Description + 0x78, 0xCB, 0x02, // Description 0x44, 0x6F, 0x65, 0x73, 0x20, 0x6E, 0x6F, 0x74, 0x20, 0x61, 0x6C, 0x6C, 0x6F, 0x77, 0x20, 0x61, 0x6E, 0x79, 0x20, 0x6E, 0x65, 0x77, 0x20, 0x70, 0x67, 0x42, 0x61, 0x63, 0x6B, 0x52, 0x65, 0x73, 0x74, 0x20, 0x70, 0x72, 0x6F, 0x63, 0x65, 0x73, 0x73, 0x65, 0x73, 0x20, 0x74, 0x6F, 0x20, 0x72, 0x75, 0x6E, 0x2E, 0x20, 0x42, 0x79, 0x20, 0x64, 0x65, 0x66, 0x61, 0x75, @@ -785,11 +785,11 @@ static const unsigned char helpDataPack[] = // verify command // ------------------------------------------------------------------------------------------------------------------------- - pckTypeBool << 4 | 0x08, // Internal - pckTypeStr << 4 | 0x08, 0x26, // Summary + 0x28, // Internal + 0x78, 0x26, // Summary 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 0x6F, 0x6E, 0x74, 0x65, 0x6E, 0x74, 0x73, 0x20, 0x6F, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x2E, - pckTypeStr << 4 | 0x08, 0x59, // Description + 0x78, 0x59, // Description 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x20, 0x77, 0x69, 0x6C, 0x6C, 0x20, 0x61, 0x74, 0x74, 0x65, 0x6D, 0x70, 0x74, 0x20, 0x74, 0x6F, 0x20, 0x64, 0x65, 0x74, 0x65, 0x72, 0x6D, 0x69, 0x6E, 0x65, 0x20, 0x69, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x73, 0x20, 0x61, 0x6E, 0x64, 0x20, 0x61, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x73, @@ -798,9 +798,9 @@ static const unsigned char helpDataPack[] = // version command // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x09, 0x0C, // Summary + 0x79, 0x0C, // Summary 0x47, 0x65, 0x74, 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6F, 0x6E, 0x2E, - pckTypeStr << 4 | 0x08, 0x26, // Description + 0x78, 0x26, // Description 0x44, 0x69, 0x73, 0x70, 0x6C, 0x61, 0x79, 0x73, 0x20, 0x69, 0x6E, 0x73, 0x74, 0x61, 0x6C, 0x6C, 0x65, 0x64, 0x20, 0x70, 0x67, 0x42, 0x61, 0x63, 0x6B, 0x52, 0x65, 0x73, 0x74, 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6F, 0x6E, 0x2E, @@ -808,16 +808,16 @@ static const unsigned char helpDataPack[] = // Options // ----------------------------------------------------------------------------------------------------------------------------- - pckTypeArray << 4, // Options begin + 0x10, // Options begin // archive-async option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x09, 0x07, // Section + 0x79, 0x07, // Section 0x61, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, - pckTypeStr << 4 | 0x08, 0x25, // Summary + 0x78, 0x25, // Summary 0x50, 0x75, 0x73, 0x68, 0x2F, 0x67, 0x65, 0x74, 0x20, 0x57, 0x41, 0x4C, 0x20, 0x73, 0x65, 0x67, 0x6D, 0x65, 0x6E, 0x74, 0x73, 0x20, 0x61, 0x73, 0x79, 0x6E, 0x63, 0x68, 0x72, 0x6F, 0x6E, 0x6F, 0x75, 0x73, 0x6C, 0x79, 0x2E, - pckTypeStr << 4 | 0x08, 0x9F, 0x02, // Description + 0x78, 0x9F, 0x02, // Description 0x45, 0x6E, 0x61, 0x62, 0x6C, 0x65, 0x73, 0x20, 0x61, 0x73, 0x79, 0x6E, 0x63, 0x68, 0x72, 0x6F, 0x6E, 0x6F, 0x75, 0x73, 0x20, 0x6F, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x74, 0x68, 0x65, 0x20, 0x61, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x2D, 0x70, 0x75, 0x73, 0x68, 0x20, 0x61, 0x6E, 0x64, 0x20, 0x61, 0x72, 0x63, 0x68, @@ -836,14 +836,14 @@ static const unsigned char helpDataPack[] = // archive-check option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x06, // Section + 0x7B, 0x06, // Section 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, - pckTypeStr << 4 | 0x08, 0x43, // Summary + 0x78, 0x43, // Summary 0x43, 0x68, 0x65, 0x63, 0x6B, 0x20, 0x74, 0x68, 0x61, 0x74, 0x20, 0x57, 0x41, 0x4C, 0x20, 0x73, 0x65, 0x67, 0x6D, 0x65, 0x6E, 0x74, 0x73, 0x20, 0x61, 0x72, 0x65, 0x20, 0x69, 0x6E, 0x20, 0x74, 0x68, 0x65, 0x20, 0x61, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x20, 0x62, 0x65, 0x66, 0x6F, 0x72, 0x65, 0x20, 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x20, 0x63, 0x6F, 0x6D, 0x70, 0x6C, 0x65, 0x74, 0x65, 0x73, 0x2E, - pckTypeStr << 4 | 0x08, 0xFD, 0x01, // Description + 0x78, 0xFD, 0x01, // Description 0x43, 0x68, 0x65, 0x63, 0x6B, 0x73, 0x20, 0x74, 0x68, 0x61, 0x74, 0x20, 0x61, 0x6C, 0x6C, 0x20, 0x57, 0x41, 0x4C, 0x20, 0x73, 0x65, 0x67, 0x6D, 0x65, 0x6E, 0x74, 0x73, 0x20, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x20, 0x74, 0x6F, 0x20, 0x6D, 0x61, 0x6B, 0x65, 0x20, 0x74, 0x68, 0x65, 0x20, 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x20, 0x63, 0x6F, 0x6E, @@ -860,13 +860,13 @@ static const unsigned char helpDataPack[] = // archive-copy option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x06, // Section + 0x7B, 0x06, // Section 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, - pckTypeStr << 4 | 0x08, 0x37, // Summary + 0x78, 0x37, // Summary 0x43, 0x6F, 0x70, 0x79, 0x20, 0x57, 0x41, 0x4C, 0x20, 0x73, 0x65, 0x67, 0x6D, 0x65, 0x6E, 0x74, 0x73, 0x20, 0x6E, 0x65, 0x65, 0x64, 0x65, 0x64, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x63, 0x6F, 0x6E, 0x73, 0x69, 0x73, 0x74, 0x65, 0x6E, 0x63, 0x79, 0x20, 0x74, 0x6F, 0x20, 0x74, 0x68, 0x65, 0x20, 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x2E, - pckTypeStr << 4 | 0x08, 0xF9, 0x05, // Description + 0x78, 0xF9, 0x05, // Description 0x54, 0x68, 0x69, 0x73, 0x20, 0x73, 0x6C, 0x69, 0x67, 0x68, 0x74, 0x6C, 0x79, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6E, 0x6F, 0x69, 0x64, 0x20, 0x6F, 0x70, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x70, 0x72, 0x6F, 0x74, 0x65, 0x63, 0x74, 0x73, 0x20, 0x61, 0x67, 0x61, 0x69, 0x6E, 0x73, 0x74, 0x20, 0x63, 0x6F, 0x72, 0x72, 0x75, 0x70, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x69, 0x6E, @@ -910,13 +910,13 @@ static const unsigned char helpDataPack[] = // archive-get-queue-max option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x07, // Section + 0x7B, 0x07, // Section 0x61, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, - pckTypeStr << 4 | 0x08, 0x31, // Summary + 0x78, 0x31, // Summary 0x4D, 0x61, 0x78, 0x69, 0x6D, 0x75, 0x6D, 0x20, 0x73, 0x69, 0x7A, 0x65, 0x20, 0x6F, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x70, 0x67, 0x42, 0x61, 0x63, 0x6B, 0x52, 0x65, 0x73, 0x74, 0x20, 0x61, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x2D, 0x67, 0x65, 0x74, 0x20, 0x71, 0x75, 0x65, 0x75, 0x65, 0x2E, - pckTypeStr << 4 | 0x08, 0x94, 0x02, // Description + 0x78, 0x94, 0x02, // Description 0x53, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x73, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6D, 0x61, 0x78, 0x69, 0x6D, 0x75, 0x6D, 0x20, 0x73, 0x69, 0x7A, 0x65, 0x20, 0x6F, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x61, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x2D, 0x67, 0x65, 0x74, 0x20, 0x71, 0x75, 0x65, 0x75, 0x65, 0x20, 0x77, 0x68, 0x65, 0x6E, 0x20, 0x61, 0x72, 0x63, @@ -935,13 +935,13 @@ static const unsigned char helpDataPack[] = // archive-header-check option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x06, // Section + 0x7B, 0x06, // Section 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, - pckTypeStr << 4 | 0x08, 0x2B, // Summary + 0x78, 0x2B, // Summary 0x43, 0x68, 0x65, 0x63, 0x6B, 0x20, 0x50, 0x6F, 0x73, 0x74, 0x67, 0x72, 0x65, 0x53, 0x51, 0x4C, 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6F, 0x6E, 0x2F, 0x69, 0x64, 0x20, 0x69, 0x6E, 0x20, 0x57, 0x41, 0x4C, 0x20, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x2E, - pckTypeStr << 4 | 0x08, 0xC5, 0x03, // Description + 0x78, 0xC5, 0x03, // Description 0x45, 0x6E, 0x61, 0x62, 0x6C, 0x65, 0x64, 0x20, 0x62, 0x79, 0x20, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6C, 0x74, 0x2C, 0x20, 0x74, 0x68, 0x69, 0x73, 0x20, 0x6F, 0x70, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x63, 0x68, 0x65, 0x63, 0x6B, 0x73, 0x20, 0x74, 0x68, 0x65, 0x20, 0x57, 0x41, 0x4C, 0x20, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x20, 0x61, 0x67, 0x61, 0x69, 0x6E, 0x73, @@ -968,13 +968,13 @@ static const unsigned char helpDataPack[] = // archive-mode option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x07, // Section + 0x7B, 0x07, // Section 0x72, 0x65, 0x73, 0x74, 0x6F, 0x72, 0x65, - pckTypeStr << 4 | 0x08, 0x32, // Summary + 0x78, 0x32, // Summary 0x50, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x20, 0x6F, 0x72, 0x20, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6C, 0x65, 0x20, 0x61, 0x72, 0x63, 0x68, 0x69, 0x76, 0x69, 0x6E, 0x67, 0x20, 0x6F, 0x6E, 0x20, 0x72, 0x65, 0x73, 0x74, 0x6F, 0x72, 0x65, 0x64, 0x20, 0x63, 0x6C, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2E, - pckTypeStr << 4 | 0x08, 0xDC, 0x03, // Description + 0x78, 0xDC, 0x03, // Description 0x54, 0x68, 0x69, 0x73, 0x20, 0x6F, 0x70, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x61, 0x6C, 0x6C, 0x6F, 0x77, 0x73, 0x20, 0x61, 0x72, 0x63, 0x68, 0x69, 0x76, 0x69, 0x6E, 0x67, 0x20, 0x74, 0x6F, 0x20, 0x62, 0x65, 0x20, 0x70, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x20, 0x6F, 0x72, 0x20, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6C, 0x65, 0x64, 0x20, 0x6F, 0x6E, 0x20, @@ -1003,13 +1003,13 @@ static const unsigned char helpDataPack[] = // archive-mode-check option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x06, // Section + 0x7B, 0x06, // Section 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, - pckTypeStr << 4 | 0x08, 0x2A, // Summary + 0x78, 0x2A, // Summary 0x43, 0x68, 0x65, 0x63, 0x6B, 0x20, 0x74, 0x68, 0x65, 0x20, 0x50, 0x6F, 0x73, 0x74, 0x67, 0x72, 0x65, 0x53, 0x51, 0x4C, 0x20, 0x61, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x5F, 0x6D, 0x6F, 0x64, 0x65, 0x20, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6E, 0x67, 0x2E, - pckTypeStr << 4 | 0x08, 0xB9, 0x03, // Description + 0x78, 0xB9, 0x03, // Description 0x45, 0x6E, 0x61, 0x62, 0x6C, 0x65, 0x64, 0x20, 0x62, 0x79, 0x20, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6C, 0x74, 0x2C, 0x20, 0x74, 0x68, 0x69, 0x73, 0x20, 0x6F, 0x70, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x64, 0x69, 0x73, 0x61, 0x6C, 0x6C, 0x6F, 0x77, 0x73, 0x20, 0x50, 0x6F, 0x73, 0x74, 0x67, 0x72, 0x65, 0x53, 0x51, 0x4C, 0x20, 0x61, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, @@ -1036,13 +1036,13 @@ static const unsigned char helpDataPack[] = // archive-push-queue-max option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x07, // Section + 0x7B, 0x07, // Section 0x61, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, - pckTypeStr << 4 | 0x08, 0x2D, // Summary + 0x78, 0x2D, // Summary 0x4D, 0x61, 0x78, 0x69, 0x6D, 0x75, 0x6D, 0x20, 0x73, 0x69, 0x7A, 0x65, 0x20, 0x6F, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x50, 0x6F, 0x73, 0x74, 0x67, 0x72, 0x65, 0x53, 0x51, 0x4C, 0x20, 0x61, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x20, 0x71, 0x75, 0x65, 0x75, 0x65, 0x2E, - pckTypeStr << 4 | 0x08, 0x95, 0x06, // Description + 0x78, 0x95, 0x06, // Description 0x41, 0x66, 0x74, 0x65, 0x72, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6C, 0x69, 0x6D, 0x69, 0x74, 0x20, 0x69, 0x73, 0x20, 0x72, 0x65, 0x61, 0x63, 0x68, 0x65, 0x64, 0x2C, 0x20, 0x74, 0x68, 0x65, 0x20, 0x66, 0x6F, 0x6C, 0x6C, 0x6F, 0x77, 0x69, 0x6E, 0x67, 0x20, 0x77, 0x69, 0x6C, 0x6C, 0x20, 0x68, 0x61, 0x70, 0x70, 0x65, 0x6E, 0x3A, 0x0A, 0x0A, @@ -1086,18 +1086,18 @@ static const unsigned char helpDataPack[] = 0x6C, 0x69, 0x65, 0x72, 0x20, 0x69, 0x73, 0x20, 0x61, 0x20, 0x70, 0x6F, 0x77, 0x65, 0x72, 0x20, 0x6F, 0x66, 0x20, 0x31, 0x30, 0x32, 0x34, 0x2E, - pckTypeArray << 4, // Deprecated names begin - pckTypeStr << 4 | 0x08, 0x11, // archive-queue-max + 0x10, // Deprecated names begin + 0x78, 0x11, // archive-queue-max 0x61, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x2D, 0x71, 0x75, 0x65, 0x75, 0x65, 0x2D, 0x6D, 0x61, 0x78, 0x00, // Deprecated names end // archive-timeout option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0A, 0x07, // Section + 0x7A, 0x07, // Section 0x61, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, - pckTypeStr << 4 | 0x08, 0x10, // Summary + 0x78, 0x10, // Summary 0x41, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x20, 0x74, 0x69, 0x6D, 0x65, 0x6F, 0x75, 0x74, 0x2E, - pckTypeStr << 4 | 0x08, 0xE9, 0x01, // Description + 0x78, 0xE9, 0x01, // Description 0x53, 0x65, 0x74, 0x20, 0x6D, 0x61, 0x78, 0x69, 0x6D, 0x75, 0x6D, 0x20, 0x74, 0x69, 0x6D, 0x65, 0x2C, 0x20, 0x69, 0x6E, 0x20, 0x73, 0x65, 0x63, 0x6F, 0x6E, 0x64, 0x73, 0x2C, 0x20, 0x74, 0x6F, 0x20, 0x77, 0x61, 0x69, 0x74, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x65, 0x61, 0x63, 0x68, 0x20, 0x57, 0x41, 0x4C, 0x20, 0x73, 0x65, 0x67, 0x6D, 0x65, 0x6E, 0x74, 0x20, 0x74, @@ -1113,12 +1113,12 @@ static const unsigned char helpDataPack[] = // backup-standby option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x06, // Section + 0x7B, 0x06, // Section 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, - pckTypeStr << 4 | 0x08, 0x20, // Summary + 0x78, 0x20, // Summary 0x42, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x20, 0x66, 0x72, 0x6F, 0x6D, 0x20, 0x74, 0x68, 0x65, 0x20, 0x73, 0x74, 0x61, 0x6E, 0x64, 0x62, 0x79, 0x20, 0x63, 0x6C, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2E, - pckTypeStr << 4 | 0x08, 0x8D, 0x01, // Description + 0x78, 0x8D, 0x01, // Description 0x45, 0x6E, 0x61, 0x62, 0x6C, 0x65, 0x20, 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x20, 0x66, 0x72, 0x6F, 0x6D, 0x20, 0x73, 0x74, 0x61, 0x6E, 0x64, 0x62, 0x79, 0x20, 0x74, 0x6F, 0x20, 0x72, 0x65, 0x64, 0x75, 0x63, 0x65, 0x20, 0x6C, 0x6F, 0x61, 0x64, 0x20, 0x6F, 0x6E, 0x20, 0x74, 0x68, 0x65, 0x20, 0x70, 0x72, 0x69, 0x6D, 0x61, 0x72, 0x79, 0x20, 0x63, 0x6C, 0x75, @@ -1130,12 +1130,12 @@ static const unsigned char helpDataPack[] = // buffer-size option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x07, // Section + 0x7B, 0x07, // Section 0x67, 0x65, 0x6E, 0x65, 0x72, 0x61, 0x6C, - pckTypeStr << 4 | 0x08, 0x20, // Summary + 0x78, 0x20, // Summary 0x42, 0x75, 0x66, 0x66, 0x65, 0x72, 0x20, 0x73, 0x69, 0x7A, 0x65, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x66, 0x69, 0x6C, 0x65, 0x20, 0x6F, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x73, 0x2E, - pckTypeStr << 4 | 0x08, 0x87, 0x04, // Description + 0x78, 0x87, 0x04, // Description 0x53, 0x65, 0x74, 0x20, 0x74, 0x68, 0x65, 0x20, 0x62, 0x75, 0x66, 0x66, 0x65, 0x72, 0x20, 0x73, 0x69, 0x7A, 0x65, 0x20, 0x75, 0x73, 0x65, 0x64, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x63, 0x6F, 0x70, 0x79, 0x2C, 0x20, 0x63, 0x6F, 0x6D, 0x70, 0x72, 0x65, 0x73, 0x73, 0x2C, 0x20, 0x61, 0x6E, 0x64, 0x20, 0x75, 0x6E, 0x63, 0x6F, 0x6D, 0x70, 0x72, 0x65, 0x73, 0x73, 0x20, @@ -1167,12 +1167,12 @@ static const unsigned char helpDataPack[] = // checksum-page option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x06, // Section + 0x7B, 0x06, // Section 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, - pckTypeStr << 4 | 0x08, 0x1D, // Summary + 0x78, 0x1D, // Summary 0x56, 0x61, 0x6C, 0x69, 0x64, 0x61, 0x74, 0x65, 0x20, 0x64, 0x61, 0x74, 0x61, 0x20, 0x70, 0x61, 0x67, 0x65, 0x20, 0x63, 0x68, 0x65, 0x63, 0x6B, 0x73, 0x75, 0x6D, 0x73, 0x2E, - pckTypeStr << 4 | 0x08, 0x82, 0x03, // Description + 0x78, 0x82, 0x03, // Description 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x73, 0x20, 0x70, 0x67, 0x42, 0x61, 0x63, 0x6B, 0x52, 0x65, 0x73, 0x74, 0x20, 0x74, 0x6F, 0x20, 0x76, 0x61, 0x6C, 0x69, 0x64, 0x61, 0x74, 0x65, 0x20, 0x61, 0x6C, 0x6C, 0x20, 0x64, 0x61, 0x74, 0x61, 0x20, 0x70, 0x61, 0x67, 0x65, 0x20, 0x63, 0x68, 0x65, 0x63, 0x6B, 0x73, 0x75, 0x6D, 0x73, 0x20, 0x77, 0x68, 0x69, 0x6C, 0x65, @@ -1196,25 +1196,25 @@ static const unsigned char helpDataPack[] = // cipher-pass option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeBool << 4 | 0x0A, // Internal - pckTypeStr << 4 | 0x08, 0x07, // Section + 0x2A, // Internal + 0x78, 0x07, // Section 0x67, 0x65, 0x6E, 0x65, 0x72, 0x61, 0x6C, - pckTypeStr << 4 | 0x08, 0x26, // Summary + 0x78, 0x26, // Summary 0x43, 0x69, 0x70, 0x68, 0x65, 0x72, 0x20, 0x70, 0x61, 0x73, 0x73, 0x70, 0x68, 0x72, 0x61, 0x73, 0x65, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6E, 0x74, 0x20, 0x63, 0x6F, 0x6D, 0x6D, 0x61, 0x6E, 0x64, 0x2E, - pckTypeStr << 4 | 0x08, 0x3C, // Description + 0x78, 0x3C, // Description 0x53, 0x70, 0x65, 0x63, 0x69, 0x66, 0x79, 0x20, 0x61, 0x6E, 0x20, 0x61, 0x64, 0x20, 0x68, 0x6F, 0x63, 0x20, 0x63, 0x69, 0x70, 0x68, 0x65, 0x72, 0x20, 0x70, 0x61, 0x73, 0x73, 0x70, 0x68, 0x72, 0x61, 0x73, 0x65, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6E, 0x74, 0x20, 0x63, 0x6F, 0x6D, 0x6D, 0x61, 0x6E, 0x64, 0x2E, // cmd-ssh option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x07, // Section + 0x7B, 0x07, // Section 0x67, 0x65, 0x6E, 0x65, 0x72, 0x61, 0x6C, - pckTypeStr << 4 | 0x08, 0x1E, // Summary + 0x78, 0x1E, // Summary 0x50, 0x61, 0x74, 0x68, 0x20, 0x74, 0x6F, 0x20, 0x73, 0x73, 0x68, 0x20, 0x63, 0x6C, 0x69, 0x65, 0x6E, 0x74, 0x20, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x61, 0x62, 0x6C, 0x65, 0x2E, - pckTypeStr << 4 | 0x08, 0x5D, // Description + 0x78, 0x5D, // Description 0x55, 0x73, 0x65, 0x20, 0x61, 0x20, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x63, 0x20, 0x53, 0x53, 0x48, 0x20, 0x63, 0x6C, 0x69, 0x65, 0x6E, 0x74, 0x20, 0x77, 0x68, 0x65, 0x6E, 0x20, 0x61, 0x6E, 0x20, 0x61, 0x6C, 0x74, 0x65, 0x72, 0x6E, 0x61, 0x74, 0x65, 0x20, 0x69, 0x73, 0x20, 0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x20, 0x6F, 0x72, 0x20, 0x74, 0x68, @@ -1223,12 +1223,12 @@ static const unsigned char helpDataPack[] = // compress option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x07, // Section + 0x7B, 0x07, // Section 0x67, 0x65, 0x6E, 0x65, 0x72, 0x61, 0x6C, - pckTypeStr << 4 | 0x08, 0x15, // Summary + 0x78, 0x15, // Summary 0x55, 0x73, 0x65, 0x20, 0x66, 0x69, 0x6C, 0x65, 0x20, 0x63, 0x6F, 0x6D, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6F, 0x6E, 0x2E, - pckTypeStr << 4 | 0x08, 0x91, 0x01, // Description + 0x78, 0x91, 0x01, // Description 0x42, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x20, 0x66, 0x69, 0x6C, 0x65, 0x73, 0x20, 0x61, 0x72, 0x65, 0x20, 0x63, 0x6F, 0x6D, 0x70, 0x61, 0x74, 0x69, 0x62, 0x6C, 0x65, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x63, 0x6F, 0x6D, 0x6D, 0x61, 0x6E, 0x64, 0x2D, 0x6C, 0x69, 0x6E, 0x65, 0x20, 0x63, 0x6F, 0x6D, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6F, 0x6E, 0x20, 0x74, 0x6F, @@ -1240,12 +1240,12 @@ static const unsigned char helpDataPack[] = // compress-level option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x07, // Section + 0x7B, 0x07, // Section 0x67, 0x65, 0x6E, 0x65, 0x72, 0x61, 0x6C, - pckTypeStr << 4 | 0x08, 0x17, // Summary + 0x78, 0x17, // Summary 0x46, 0x69, 0x6C, 0x65, 0x20, 0x63, 0x6F, 0x6D, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6F, 0x6E, 0x20, 0x6C, 0x65, 0x76, 0x65, 0x6C, 0x2E, - pckTypeStr << 4 | 0x08, 0xFD, 0x01, // Description + 0x78, 0xFD, 0x01, // Description 0x53, 0x65, 0x74, 0x73, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6C, 0x65, 0x76, 0x65, 0x6C, 0x20, 0x74, 0x6F, 0x20, 0x62, 0x65, 0x20, 0x75, 0x73, 0x65, 0x64, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x66, 0x69, 0x6C, 0x65, 0x20, 0x63, 0x6F, 0x6D, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6F, 0x6E, 0x20, 0x77, 0x68, 0x65, 0x6E, 0x20, 0x63, 0x6F, 0x6D, 0x70, 0x72, 0x65, 0x73, 0x73, @@ -1264,12 +1264,12 @@ static const unsigned char helpDataPack[] = // compress-level-network option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x07, // Section + 0x7B, 0x07, // Section 0x67, 0x65, 0x6E, 0x65, 0x72, 0x61, 0x6C, - pckTypeStr << 4 | 0x08, 0x1A, // Summary + 0x78, 0x1A, // Summary 0x4E, 0x65, 0x74, 0x77, 0x6F, 0x72, 0x6B, 0x20, 0x63, 0x6F, 0x6D, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6F, 0x6E, 0x20, 0x6C, 0x65, 0x76, 0x65, 0x6C, 0x2E, - pckTypeStr << 4 | 0x08, 0xA6, 0x03, // Description + 0x78, 0xA6, 0x03, // Description 0x53, 0x65, 0x74, 0x73, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6E, 0x65, 0x74, 0x77, 0x6F, 0x72, 0x6B, 0x20, 0x63, 0x6F, 0x6D, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6F, 0x6E, 0x20, 0x6C, 0x65, 0x76, 0x65, 0x6C, 0x20, 0x77, 0x68, 0x65, 0x6E, 0x20, 0x63, 0x6F, 0x6D, 0x70, 0x72, 0x65, 0x73, 0x73, 0x2D, 0x74, 0x79, 0x70, 0x65, 0x3D, 0x6E, 0x6F, 0x6E, 0x65, 0x20, 0x61, @@ -1295,12 +1295,12 @@ static const unsigned char helpDataPack[] = // compress-type option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x07, // Section + 0x7B, 0x07, // Section 0x67, 0x65, 0x6E, 0x65, 0x72, 0x61, 0x6C, - pckTypeStr << 4 | 0x08, 0x16, // Summary + 0x78, 0x16, // Summary 0x46, 0x69, 0x6C, 0x65, 0x20, 0x63, 0x6F, 0x6D, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6F, 0x6E, 0x20, 0x74, 0x79, 0x70, 0x65, 0x2E, - pckTypeStr << 4 | 0x08, 0x8D, 0x02, // Description + 0x78, 0x8D, 0x02, // Description 0x54, 0x68, 0x65, 0x20, 0x66, 0x6F, 0x6C, 0x6C, 0x6F, 0x77, 0x69, 0x6E, 0x67, 0x20, 0x63, 0x6F, 0x6D, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6F, 0x6E, 0x20, 0x74, 0x79, 0x70, 0x65, 0x73, 0x20, 0x61, 0x72, 0x65, 0x20, 0x73, 0x75, 0x70, 0x70, 0x6F, 0x72, 0x74, 0x65, 0x64, 0x3A, 0x0A, 0x0A, @@ -1321,12 +1321,12 @@ static const unsigned char helpDataPack[] = // config option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x07, // Section + 0x7B, 0x07, // Section 0x67, 0x65, 0x6E, 0x65, 0x72, 0x61, 0x6C, - pckTypeStr << 4 | 0x08, 0x1E, // Summary + 0x78, 0x1E, // Summary 0x70, 0x67, 0x42, 0x61, 0x63, 0x6B, 0x52, 0x65, 0x73, 0x74, 0x20, 0x63, 0x6F, 0x6E, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x66, 0x69, 0x6C, 0x65, 0x2E, - pckTypeStr << 4 | 0x08, 0x4B, // Description + 0x78, 0x4B, // Description 0x55, 0x73, 0x65, 0x20, 0x74, 0x68, 0x69, 0x73, 0x20, 0x6F, 0x70, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x74, 0x6F, 0x20, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x79, 0x20, 0x61, 0x20, 0x64, 0x69, 0x66, 0x66, 0x65, 0x72, 0x65, 0x6E, 0x74, 0x20, 0x63, 0x6F, 0x6E, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x66, 0x69, 0x6C, 0x65, 0x20, 0x74, 0x68, @@ -1334,13 +1334,13 @@ static const unsigned char helpDataPack[] = // config-include-path option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x07, // Section + 0x7B, 0x07, // Section 0x67, 0x65, 0x6E, 0x65, 0x72, 0x61, 0x6C, - pckTypeStr << 4 | 0x08, 0x32, // Summary + 0x78, 0x32, // Summary 0x50, 0x61, 0x74, 0x68, 0x20, 0x74, 0x6F, 0x20, 0x61, 0x64, 0x64, 0x69, 0x74, 0x69, 0x6F, 0x6E, 0x61, 0x6C, 0x20, 0x70, 0x67, 0x42, 0x61, 0x63, 0x6B, 0x52, 0x65, 0x73, 0x74, 0x20, 0x63, 0x6F, 0x6E, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x66, 0x69, 0x6C, 0x65, 0x73, 0x2E, - pckTypeStr << 4 | 0x08, 0xAD, 0x01, // Description + 0x78, 0xAD, 0x01, // Description 0x43, 0x6F, 0x6E, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x66, 0x69, 0x6C, 0x65, 0x73, 0x20, 0x65, 0x78, 0x69, 0x73, 0x74, 0x69, 0x6E, 0x67, 0x20, 0x69, 0x6E, 0x20, 0x74, 0x68, 0x65, 0x20, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x64, 0x20, 0x6C, 0x6F, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, @@ -1353,13 +1353,13 @@ static const unsigned char helpDataPack[] = // config-path option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x07, // Section + 0x7B, 0x07, // Section 0x67, 0x65, 0x6E, 0x65, 0x72, 0x61, 0x6C, - pckTypeStr << 4 | 0x08, 0x2C, // Summary + 0x78, 0x2C, // Summary 0x42, 0x61, 0x73, 0x65, 0x20, 0x70, 0x61, 0x74, 0x68, 0x20, 0x6F, 0x66, 0x20, 0x70, 0x67, 0x42, 0x61, 0x63, 0x6B, 0x52, 0x65, 0x73, 0x74, 0x20, 0x63, 0x6F, 0x6E, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x66, 0x69, 0x6C, 0x65, 0x73, 0x2E, - pckTypeStr << 4 | 0x08, 0xF9, 0x02, // Description + 0x78, 0xF9, 0x02, // Description 0x54, 0x68, 0x69, 0x73, 0x20, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6E, 0x67, 0x20, 0x69, 0x73, 0x20, 0x75, 0x73, 0x65, 0x64, 0x20, 0x74, 0x6F, 0x20, 0x6F, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x20, 0x74, 0x68, 0x65, 0x20, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6C, 0x74, 0x20, 0x62, 0x61, 0x73, 0x65, 0x20, 0x70, 0x61, 0x74, 0x68, 0x20, 0x73, 0x65, 0x74, 0x74, 0x69, @@ -1383,13 +1383,13 @@ static const unsigned char helpDataPack[] = // db-exclude option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x07, // Section + 0x7B, 0x07, // Section 0x72, 0x65, 0x73, 0x74, 0x6F, 0x72, 0x65, - pckTypeStr << 4 | 0x08, 0x2A, // Summary + 0x78, 0x2A, // Summary 0x52, 0x65, 0x73, 0x74, 0x6F, 0x72, 0x65, 0x20, 0x65, 0x78, 0x63, 0x6C, 0x75, 0x64, 0x69, 0x6E, 0x67, 0x20, 0x74, 0x68, 0x65, 0x20, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x64, 0x20, 0x64, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x73, 0x2E, - pckTypeStr << 4 | 0x08, 0xDE, 0x03, // Description + 0x78, 0xDE, 0x03, // Description 0x44, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x73, 0x20, 0x65, 0x78, 0x63, 0x6C, 0x75, 0x64, 0x65, 0x64, 0x20, 0x77, 0x69, 0x6C, 0x6C, 0x20, 0x62, 0x65, 0x20, 0x72, 0x65, 0x73, 0x74, 0x6F, 0x72, 0x65, 0x64, 0x20, 0x61, 0x73, 0x20, 0x73, 0x70, 0x61, 0x72, 0x73, 0x65, 0x2C, 0x20, 0x7A, 0x65, 0x72, 0x6F, 0x65, 0x64, 0x20, 0x66, 0x69, 0x6C, 0x65, 0x73, 0x20, @@ -1418,12 +1418,12 @@ static const unsigned char helpDataPack[] = // db-include option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x07, // Section + 0x7B, 0x07, // Section 0x72, 0x65, 0x73, 0x74, 0x6F, 0x72, 0x65, - pckTypeStr << 4 | 0x08, 0x21, // Summary + 0x78, 0x21, // Summary 0x52, 0x65, 0x73, 0x74, 0x6F, 0x72, 0x65, 0x20, 0x6F, 0x6E, 0x6C, 0x79, 0x20, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x64, 0x20, 0x64, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x73, 0x2E, - pckTypeStr << 4 | 0x08, 0xE2, 0x04, // Description + 0x78, 0xE2, 0x04, // Description 0x54, 0x68, 0x69, 0x73, 0x20, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x20, 0x61, 0x6C, 0x6C, 0x6F, 0x77, 0x73, 0x20, 0x6F, 0x6E, 0x6C, 0x79, 0x20, 0x73, 0x65, 0x6C, 0x65, 0x63, 0x74, 0x65, 0x64, 0x20, 0x64, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x73, 0x20, 0x74, 0x6F, 0x20, 0x62, 0x65, 0x20, 0x72, 0x65, 0x73, 0x74, 0x6F, 0x72, 0x65, 0x64, 0x2E, 0x20, @@ -1459,12 +1459,12 @@ static const unsigned char helpDataPack[] = // db-timeout option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x07, // Section + 0x7B, 0x07, // Section 0x67, 0x65, 0x6E, 0x65, 0x72, 0x61, 0x6C, - pckTypeStr << 4 | 0x08, 0x17, // Summary + 0x78, 0x17, // Summary 0x44, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x20, 0x71, 0x75, 0x65, 0x72, 0x79, 0x20, 0x74, 0x69, 0x6D, 0x65, 0x6F, 0x75, 0x74, 0x2E, - pckTypeStr << 4 | 0x08, 0xEA, 0x03, // Description + 0x78, 0xEA, 0x03, // Description 0x53, 0x65, 0x74, 0x73, 0x20, 0x74, 0x68, 0x65, 0x20, 0x74, 0x69, 0x6D, 0x65, 0x6F, 0x75, 0x74, 0x2C, 0x20, 0x69, 0x6E, 0x20, 0x73, 0x65, 0x63, 0x6F, 0x6E, 0x64, 0x73, 0x2C, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x71, 0x75, 0x65, 0x72, 0x69, 0x65, 0x73, 0x20, 0x61, 0x67, 0x61, 0x69, 0x6E, 0x73, 0x74, 0x20, 0x74, 0x68, 0x65, 0x20, 0x64, 0x61, 0x74, 0x61, 0x62, 0x61, @@ -1493,12 +1493,12 @@ static const unsigned char helpDataPack[] = // delta option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x07, // Section + 0x7B, 0x07, // Section 0x67, 0x65, 0x6E, 0x65, 0x72, 0x61, 0x6C, - pckTypeStr << 4 | 0x08, 0x22, // Summary + 0x78, 0x22, // Summary 0x52, 0x65, 0x73, 0x74, 0x6F, 0x72, 0x65, 0x20, 0x6F, 0x72, 0x20, 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x20, 0x75, 0x73, 0x69, 0x6E, 0x67, 0x20, 0x63, 0x68, 0x65, 0x63, 0x6B, 0x73, 0x75, 0x6D, 0x73, 0x2E, - pckTypeStr << 4 | 0x08, 0x98, 0x02, // Description + 0x78, 0x98, 0x02, // Description 0x44, 0x75, 0x72, 0x69, 0x6E, 0x67, 0x20, 0x61, 0x20, 0x72, 0x65, 0x73, 0x74, 0x6F, 0x72, 0x65, 0x2C, 0x20, 0x62, 0x79, 0x20, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6C, 0x74, 0x20, 0x74, 0x68, 0x65, 0x20, 0x50, 0x6F, 0x73, 0x74, 0x67, 0x72, 0x65, 0x53, 0x51, 0x4C, 0x20, 0x64, 0x61, 0x74, 0x61, 0x20, 0x61, 0x6E, 0x64, 0x20, 0x74, 0x61, 0x62, 0x6C, 0x65, 0x73, 0x70, @@ -1517,12 +1517,12 @@ static const unsigned char helpDataPack[] = // dry-run option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x07, // Section + 0x7B, 0x07, // Section 0x67, 0x65, 0x6E, 0x65, 0x72, 0x61, 0x6C, - pckTypeStr << 4 | 0x08, 0x22, // Summary + 0x78, 0x22, // Summary 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x20, 0x61, 0x20, 0x64, 0x72, 0x79, 0x2D, 0x72, 0x75, 0x6E, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 0x6F, 0x6D, 0x6D, 0x61, 0x6E, 0x64, 0x2E, - pckTypeStr << 4 | 0x08, 0xCC, 0x01, // Description + 0x78, 0xCC, 0x01, // Description 0x54, 0x68, 0x65, 0x20, 0x2D, 0x2D, 0x64, 0x72, 0x79, 0x2D, 0x72, 0x75, 0x6E, 0x20, 0x6F, 0x70, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x69, 0x73, 0x20, 0x61, 0x20, 0x63, 0x6F, 0x6D, 0x6D, 0x61, 0x6E, 0x64, 0x2D, 0x6C, 0x69, 0x6E, 0x65, 0x20, 0x6F, 0x6E, 0x6C, 0x79, 0x20, 0x6F, 0x70, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x61, 0x6E, 0x64, 0x20, 0x63, 0x61, 0x6E, 0x20, 0x62, @@ -1537,12 +1537,12 @@ static const unsigned char helpDataPack[] = // exclude option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x06, // Section + 0x7B, 0x06, // Section 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, - pckTypeStr << 4 | 0x08, 0x24, // Summary + 0x78, 0x24, // Summary 0x45, 0x78, 0x63, 0x6C, 0x75, 0x64, 0x65, 0x20, 0x70, 0x61, 0x74, 0x68, 0x73, 0x2F, 0x66, 0x69, 0x6C, 0x65, 0x73, 0x20, 0x66, 0x72, 0x6F, 0x6D, 0x20, 0x74, 0x68, 0x65, 0x20, 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x2E, - pckTypeStr << 4 | 0x08, 0xD8, 0x09, // Description + 0x78, 0xD8, 0x09, // Description 0x41, 0x6C, 0x6C, 0x20, 0x65, 0x78, 0x63, 0x6C, 0x75, 0x73, 0x69, 0x6F, 0x6E, 0x73, 0x20, 0x61, 0x72, 0x65, 0x20, 0x72, 0x65, 0x6C, 0x61, 0x74, 0x69, 0x76, 0x65, 0x20, 0x74, 0x6F, 0x20, 0x24, 0x50, 0x47, 0x44, 0x41, 0x54, 0x41, 0x2E, 0x20, 0x49, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x65, 0x78, 0x63, 0x6C, 0x75, 0x73, 0x69, 0x6F, 0x6E, 0x20, 0x65, 0x6E, 0x64, @@ -1611,13 +1611,13 @@ static const unsigned char helpDataPack[] = // exec-id option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeBool << 4 | 0x0A, // Internal - pckTypeStr << 4 | 0x08, 0x07, // Section + 0x2A, // Internal + 0x78, 0x07, // Section 0x67, 0x65, 0x6E, 0x65, 0x72, 0x61, 0x6C, - pckTypeStr << 4 | 0x08, 0x22, // Summary + 0x78, 0x22, // Summary 0x55, 0x6E, 0x69, 0x71, 0x75, 0x65, 0x20, 0x69, 0x64, 0x65, 0x6E, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x74, 0x68, 0x65, 0x20, 0x70, 0x72, 0x6F, 0x63, 0x65, 0x73, 0x73, 0x2E, - pckTypeStr << 4 | 0x08, 0x9E, 0x02, // Description + 0x78, 0x9E, 0x02, // Description 0x41, 0x20, 0x6C, 0x6F, 0x63, 0x61, 0x6C, 0x6C, 0x79, 0x20, 0x75, 0x6E, 0x69, 0x71, 0x75, 0x65, 0x20, 0x69, 0x64, 0x65, 0x6E, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x20, 0x75, 0x73, 0x65, 0x64, 0x20, 0x74, 0x6F, 0x20, 0x69, 0x64, 0x65, 0x6E, 0x74, 0x69, 0x66, 0x79, 0x20, 0x61, 0x20, 0x70, 0x72, 0x6F, 0x63, 0x65, 0x73, 0x73, 0x20, 0x77, 0x68, 0x65, 0x6E, 0x20, @@ -1636,14 +1636,14 @@ static const unsigned char helpDataPack[] = // expire-auto option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x06, // Section + 0x7B, 0x06, // Section 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, - pckTypeStr << 4 | 0x08, 0x3F, // Summary + 0x78, 0x3F, // Summary 0x41, 0x75, 0x74, 0x6F, 0x6D, 0x61, 0x74, 0x69, 0x63, 0x61, 0x6C, 0x6C, 0x79, 0x20, 0x72, 0x75, 0x6E, 0x20, 0x74, 0x68, 0x65, 0x20, 0x65, 0x78, 0x70, 0x69, 0x72, 0x65, 0x20, 0x63, 0x6F, 0x6D, 0x6D, 0x61, 0x6E, 0x64, 0x20, 0x61, 0x66, 0x74, 0x65, 0x72, 0x20, 0x61, 0x20, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x66, 0x75, 0x6C, 0x20, 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x2E, - pckTypeStr << 4 | 0x08, 0x9D, 0x02, // Description + 0x78, 0x9D, 0x02, // Description 0x54, 0x68, 0x65, 0x20, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6E, 0x67, 0x20, 0x69, 0x73, 0x20, 0x65, 0x6E, 0x61, 0x62, 0x6C, 0x65, 0x64, 0x20, 0x62, 0x79, 0x20, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6C, 0x74, 0x2E, 0x20, 0x55, 0x73, 0x65, 0x20, 0x63, 0x61, 0x75, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x77, 0x68, 0x65, 0x6E, 0x20, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6C, 0x69, 0x6E, @@ -1662,14 +1662,14 @@ static const unsigned char helpDataPack[] = // filter option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeArray << 4 | 0x07, // Command overrides begin + 0x17, // Command overrides begin - pckTypeObj << 4 | 0x09, 0x01, // Command repo-ls override begin - pckTypeStr << 4 | 0x09, 0x28, // Summary + 0x59, 0x01, // Command repo-ls override begin + 0x79, 0x28, // Summary 0x46, 0x69, 0x6C, 0x74, 0x65, 0x72, 0x20, 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x61, 0x20, 0x72, 0x65, 0x67, 0x75, 0x6C, 0x61, 0x72, 0x20, 0x65, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6F, 0x6E, 0x2E, - pckTypeStr << 4 | 0x08, 0x49, // Description + 0x78, 0x49, // Description 0x54, 0x68, 0x65, 0x20, 0x66, 0x69, 0x6C, 0x74, 0x65, 0x72, 0x20, 0x69, 0x73, 0x20, 0x61, 0x70, 0x70, 0x6C, 0x69, 0x65, 0x64, 0x20, 0x61, 0x67, 0x61, 0x69, 0x6E, 0x73, 0x74, 0x20, 0x74, 0x68, 0x65, 0x20, 0x66, 0x69, 0x6C, 0x65, 0x2F, 0x70, 0x61, 0x74, 0x68, 0x20, 0x6E, 0x61, 0x6D, 0x65, 0x73, 0x20, 0x62, 0x65, 0x66, 0x6F, @@ -1681,13 +1681,13 @@ static const unsigned char helpDataPack[] = // force option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeArray << 4 | 0x05, // Command overrides begin + 0x15, // Command overrides begin - pckTypeObj << 4 | 0x02, // Command backup override begin - pckTypeStr << 4 | 0x09, 0x18, // Summary + 0x52, // Command backup override begin + 0x79, 0x18, // Summary 0x46, 0x6F, 0x72, 0x63, 0x65, 0x20, 0x61, 0x6E, 0x20, 0x6F, 0x66, 0x66, 0x6C, 0x69, 0x6E, 0x65, 0x20, 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x2E, - pckTypeStr << 4 | 0x08, 0xF3, 0x04, // Description + 0x78, 0xF3, 0x04, // Description 0x57, 0x68, 0x65, 0x6E, 0x20, 0x75, 0x73, 0x65, 0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x2D, 0x2D, 0x6E, 0x6F, 0x2D, 0x73, 0x74, 0x61, 0x72, 0x74, 0x2D, 0x73, 0x74, 0x6F, 0x70, 0x20, 0x61, 0x20, 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x20, 0x77, 0x69, 0x6C, 0x6C, 0x20, 0x62, 0x65, 0x20, 0x72, 0x75, 0x6E, 0x20, 0x65, 0x76, @@ -1726,10 +1726,10 @@ static const unsigned char helpDataPack[] = 0x2E, 0x00, // Command backup override end - pckTypeObj << 4 | 0x09, 0x01, // Command restore override begin - pckTypeStr << 4 | 0x09, 0x10, // Summary + 0x59, 0x01, // Command restore override begin + 0x79, 0x10, // Summary 0x46, 0x6F, 0x72, 0x63, 0x65, 0x20, 0x61, 0x20, 0x72, 0x65, 0x73, 0x74, 0x6F, 0x72, 0x65, 0x2E, - pckTypeStr << 4 | 0x08, 0xC4, 0x01, // Description + 0x78, 0xC4, 0x01, // Description 0x42, 0x79, 0x20, 0x69, 0x74, 0x73, 0x65, 0x6C, 0x66, 0x20, 0x74, 0x68, 0x69, 0x73, 0x20, 0x6F, 0x70, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x66, 0x6F, 0x72, 0x63, 0x65, 0x73, 0x20, 0x74, 0x68, 0x65, 0x20, 0x50, 0x6F, 0x73, 0x74, 0x67, 0x72, 0x65, 0x53, 0x51, 0x4C, 0x20, 0x64, 0x61, 0x74, 0x61, 0x20, 0x61, 0x6E, 0x64, 0x20, 0x74, @@ -1743,21 +1743,21 @@ static const unsigned char helpDataPack[] = 0x75, 0x73, 0x69, 0x6E, 0x67, 0x20, 0x63, 0x68, 0x65, 0x63, 0x6B, 0x73, 0x75, 0x6D, 0x73, 0x2E, 0x00, // Command restore override end - pckTypeObj << 4, // Command stanza-create override begin - pckTypeBool << 4 | 0x08, // Internal - pckTypeStr << 4 | 0x08, 0x16, // Summary + 0x50, // Command stanza-create override begin + 0x28, // Internal + 0x78, 0x16, // Summary 0x46, 0x6F, 0x72, 0x63, 0x65, 0x20, 0x73, 0x74, 0x61, 0x6E, 0x7A, 0x61, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x2E, - pckTypeStr << 4 | 0x08, 0x23, // Description + 0x78, 0x23, // Description 0x54, 0x68, 0x69, 0x73, 0x20, 0x6F, 0x70, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x69, 0x73, 0x20, 0x6E, 0x6F, 0x20, 0x6C, 0x6F, 0x6E, 0x67, 0x65, 0x72, 0x20, 0x73, 0x75, 0x70, 0x70, 0x6F, 0x72, 0x74, 0x65, 0x64, 0x2E, 0x00, // Command stanza-create override end - pckTypeObj << 4, // Command stanza-delete override begin - pckTypeStr << 4 | 0x09, 0x14, // Summary + 0x50, // Command stanza-delete override begin + 0x79, 0x14, // Summary 0x46, 0x6F, 0x72, 0x63, 0x65, 0x20, 0x73, 0x74, 0x61, 0x6E, 0x7A, 0x61, 0x20, 0x64, 0x65, 0x6C, 0x65, 0x74, 0x65, 0x2E, - pckTypeStr << 4 | 0x08, 0x82, 0x01, // Description + 0x78, 0x82, 0x01, // Description 0x49, 0x66, 0x20, 0x50, 0x6F, 0x73, 0x74, 0x67, 0x72, 0x65, 0x53, 0x51, 0x4C, 0x20, 0x69, 0x73, 0x20, 0x73, 0x74, 0x69, 0x6C, 0x6C, 0x20, 0x72, 0x75, 0x6E, 0x6E, 0x69, 0x6E, 0x67, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x74, 0x68, 0x65, 0x20, 0x73, 0x74, 0x61, 0x6E, 0x7A, 0x61, 0x2C, 0x20, 0x74, 0x68, 0x65, 0x6E, 0x20, 0x74, 0x68, @@ -1768,12 +1768,12 @@ static const unsigned char helpDataPack[] = 0x6F, 0x72, 0x79, 0x2E, 0x00, // Command stanza-delete override end - pckTypeObj << 4 | 0x02, // Command stop override begin - pckTypeStr << 4 | 0x09, 0x27, // Summary + 0x52, // Command stop override begin + 0x79, 0x27, // Summary 0x46, 0x6F, 0x72, 0x63, 0x65, 0x20, 0x61, 0x6C, 0x6C, 0x20, 0x70, 0x67, 0x42, 0x61, 0x63, 0x6B, 0x52, 0x65, 0x73, 0x74, 0x20, 0x70, 0x72, 0x6F, 0x63, 0x65, 0x73, 0x73, 0x65, 0x73, 0x20, 0x74, 0x6F, 0x20, 0x73, 0x74, 0x6F, 0x70, 0x2E, - pckTypeStr << 4 | 0x08, 0x98, 0x03, // Description + 0x78, 0x98, 0x03, // Description 0x54, 0x68, 0x69, 0x73, 0x20, 0x6F, 0x70, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x77, 0x69, 0x6C, 0x6C, 0x20, 0x73, 0x65, 0x6E, 0x64, 0x20, 0x54, 0x45, 0x52, 0x4D, 0x20, 0x73, 0x69, 0x67, 0x6E, 0x61, 0x6C, 0x73, 0x20, 0x74, 0x6F, 0x20, 0x61, 0x6C, 0x6C, 0x20, 0x72, 0x75, 0x6E, 0x6E, 0x69, 0x6E, 0x67, 0x20, 0x70, 0x67, 0x42, 0x61, @@ -1803,13 +1803,13 @@ static const unsigned char helpDataPack[] = // ignore-missing option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeArray << 4 | 0x05, // Command overrides begin + 0x15, // Command overrides begin - pckTypeObj << 4 | 0x08, 0x01, // Command repo-get override begin - pckTypeStr << 4 | 0x09, 0x1B, // Summary + 0x58, 0x01, // Command repo-get override begin + 0x79, 0x1B, // Summary 0x49, 0x67, 0x6E, 0x6F, 0x72, 0x65, 0x20, 0x6D, 0x69, 0x73, 0x73, 0x69, 0x6E, 0x67, 0x20, 0x73, 0x6F, 0x75, 0x72, 0x63, 0x65, 0x20, 0x66, 0x69, 0x6C, 0x65, 0x2E, - pckTypeStr << 4 | 0x08, 0x43, // Description + 0x78, 0x43, // Description 0x45, 0x78, 0x69, 0x74, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x31, 0x20, 0x69, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x73, 0x6F, 0x75, 0x72, 0x63, 0x65, 0x20, 0x66, 0x69, 0x6C, 0x65, 0x20, 0x69, 0x73, 0x20, 0x6D, 0x69, 0x73, 0x73, 0x69, 0x6E, 0x67, 0x20, 0x62, 0x75, 0x74, 0x20, 0x64, 0x6F, 0x6E, 0x27, 0x74, 0x20, 0x74, 0x68, @@ -1820,11 +1820,11 @@ static const unsigned char helpDataPack[] = // io-timeout option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x09, 0x07, // Section + 0x79, 0x07, // Section 0x67, 0x65, 0x6E, 0x65, 0x72, 0x61, 0x6C, - pckTypeStr << 4 | 0x08, 0x0C, // Summary + 0x78, 0x0C, // Summary 0x49, 0x2F, 0x4F, 0x20, 0x74, 0x69, 0x6D, 0x65, 0x6F, 0x75, 0x74, 0x2E, - pckTypeStr << 4 | 0x08, 0xDF, 0x01, // Description + 0x78, 0xDF, 0x01, // Description 0x54, 0x69, 0x6D, 0x65, 0x6F, 0x75, 0x74, 0x2C, 0x20, 0x69, 0x6E, 0x20, 0x73, 0x65, 0x63, 0x6F, 0x6E, 0x64, 0x73, 0x2C, 0x20, 0x75, 0x73, 0x65, 0x64, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x63, 0x6F, 0x6E, 0x6E, 0x65, 0x63, 0x74, 0x69, 0x6F, 0x6E, 0x73, 0x20, 0x61, 0x6E, 0x64, 0x20, 0x72, 0x65, 0x61, 0x64, 0x2F, 0x77, 0x72, 0x69, 0x74, 0x65, 0x20, 0x6F, 0x70, 0x65, @@ -1840,13 +1840,13 @@ static const unsigned char helpDataPack[] = // job-retry option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeBool << 4 | 0x0A, // Internal - pckTypeStr << 4 | 0x08, 0x07, // Section + 0x2A, // Internal + 0x78, 0x07, // Section 0x67, 0x65, 0x6E, 0x65, 0x72, 0x61, 0x6C, - pckTypeStr << 4 | 0x08, 0x1B, // Summary + 0x78, 0x1B, // Summary 0x52, 0x65, 0x74, 0x72, 0x79, 0x20, 0x63, 0x6F, 0x75, 0x6E, 0x74, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x6C, 0x6F, 0x63, 0x61, 0x6C, 0x20, 0x6A, 0x6F, 0x62, 0x73, 0x2E, - pckTypeStr << 4 | 0x08, 0x4A, // Description + 0x78, 0x4A, // Description 0x54, 0x68, 0x65, 0x20, 0x6E, 0x75, 0x6D, 0x62, 0x65, 0x72, 0x20, 0x6F, 0x66, 0x20, 0x72, 0x65, 0x74, 0x72, 0x69, 0x65, 0x73, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x6A, 0x6F, 0x62, 0x73, 0x20, 0x72, 0x75, 0x6E, 0x20, 0x69, 0x6E, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6C, 0x6F, 0x63, 0x61, 0x6C, 0x20, 0x70, 0x72, 0x6F, 0x63, 0x65, 0x73, 0x73, 0x2C, 0x20, 0x65, 0x2E, 0x67, @@ -1854,13 +1854,13 @@ static const unsigned char helpDataPack[] = // job-retry-interval option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeBool << 4 | 0x0A, // Internal - pckTypeStr << 4 | 0x08, 0x07, // Section + 0x2A, // Internal + 0x78, 0x07, // Section 0x67, 0x65, 0x6E, 0x65, 0x72, 0x61, 0x6C, - pckTypeStr << 4 | 0x08, 0x21, // Summary + 0x78, 0x21, // Summary 0x52, 0x65, 0x74, 0x72, 0x79, 0x20, 0x69, 0x6E, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6C, 0x20, 0x61, 0x66, 0x74, 0x65, 0x72, 0x20, 0x66, 0x69, 0x72, 0x73, 0x74, 0x20, 0x72, 0x65, 0x74, 0x72, 0x79, 0x2E, - pckTypeStr << 4 | 0x08, 0x91, 0x01, // Description + 0x78, 0x91, 0x01, // Description 0x54, 0x68, 0x65, 0x20, 0x66, 0x69, 0x72, 0x73, 0x74, 0x20, 0x72, 0x65, 0x74, 0x72, 0x79, 0x20, 0x69, 0x73, 0x20, 0x61, 0x6C, 0x77, 0x61, 0x79, 0x73, 0x20, 0x70, 0x65, 0x72, 0x66, 0x6F, 0x72, 0x6D, 0x65, 0x64, 0x20, 0x69, 0x6D, 0x6D, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x6C, 0x79, 0x2E, 0x20, 0x54, 0x68, 0x69, 0x73, 0x20, 0x6F, 0x70, 0x74, 0x69, 0x6F, 0x6E, @@ -1872,12 +1872,12 @@ static const unsigned char helpDataPack[] = // link-all option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x07, // Section + 0x7B, 0x07, // Section 0x72, 0x65, 0x73, 0x74, 0x6F, 0x72, 0x65, - pckTypeStr << 4 | 0x08, 0x15, // Summary + 0x78, 0x15, // Summary 0x52, 0x65, 0x73, 0x74, 0x6F, 0x72, 0x65, 0x20, 0x61, 0x6C, 0x6C, 0x20, 0x73, 0x79, 0x6D, 0x6C, 0x69, 0x6E, 0x6B, 0x73, 0x2E, - pckTypeStr << 4 | 0x08, 0xE8, 0x02, // Description + 0x78, 0xE8, 0x02, // Description 0x42, 0x79, 0x20, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6C, 0x74, 0x20, 0x73, 0x79, 0x6D, 0x6C, 0x69, 0x6E, 0x6B, 0x65, 0x64, 0x20, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6F, 0x72, 0x69, 0x65, 0x73, 0x20, 0x61, 0x6E, 0x64, 0x20, 0x66, 0x69, 0x6C, 0x65, 0x73, 0x20, 0x61, 0x72, 0x65, 0x20, 0x72, 0x65, 0x73, 0x74, 0x6F, 0x72, 0x65, 0x64, 0x20, 0x61, 0x73, 0x20, 0x6E, @@ -1899,12 +1899,12 @@ static const unsigned char helpDataPack[] = // link-map option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x07, // Section + 0x7B, 0x07, // Section 0x72, 0x65, 0x73, 0x74, 0x6F, 0x72, 0x65, - pckTypeStr << 4 | 0x08, 0x24, // Summary + 0x78, 0x24, // Summary 0x4D, 0x6F, 0x64, 0x69, 0x66, 0x79, 0x20, 0x74, 0x68, 0x65, 0x20, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6E, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x6F, 0x66, 0x20, 0x61, 0x20, 0x73, 0x79, 0x6D, 0x6C, 0x69, 0x6E, 0x6B, 0x2E, - pckTypeStr << 4 | 0x08, 0xD0, 0x01, // Description + 0x78, 0xD0, 0x01, // Description 0x41, 0x6C, 0x6C, 0x6F, 0x77, 0x73, 0x20, 0x74, 0x68, 0x65, 0x20, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6E, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x66, 0x69, 0x6C, 0x65, 0x20, 0x6F, 0x72, 0x20, 0x70, 0x61, 0x74, 0x68, 0x20, 0x6F, 0x66, 0x20, 0x61, 0x20, 0x73, 0x79, 0x6D, 0x6C, 0x69, 0x6E, 0x6B, 0x20, 0x74, 0x6F, 0x20, 0x62, 0x65, 0x20, 0x63, 0x68, 0x61, 0x6E, 0x67, @@ -1919,12 +1919,12 @@ static const unsigned char helpDataPack[] = // lock-path option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x07, // Section + 0x7B, 0x07, // Section 0x67, 0x65, 0x6E, 0x65, 0x72, 0x61, 0x6C, - pckTypeStr << 4 | 0x08, 0x21, // Summary + 0x78, 0x21, // Summary 0x50, 0x61, 0x74, 0x68, 0x20, 0x77, 0x68, 0x65, 0x72, 0x65, 0x20, 0x6C, 0x6F, 0x63, 0x6B, 0x20, 0x66, 0x69, 0x6C, 0x65, 0x73, 0x20, 0x61, 0x72, 0x65, 0x20, 0x73, 0x74, 0x6F, 0x72, 0x65, 0x64, 0x2E, - pckTypeStr << 4 | 0x08, 0x84, 0x01, // Description + 0x78, 0x84, 0x01, // Description 0x54, 0x68, 0x65, 0x20, 0x6C, 0x6F, 0x63, 0x6B, 0x20, 0x70, 0x61, 0x74, 0x68, 0x20, 0x70, 0x72, 0x6F, 0x76, 0x69, 0x64, 0x65, 0x73, 0x20, 0x61, 0x20, 0x6C, 0x6F, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x70, 0x67, 0x42, 0x61, 0x63, 0x6B, 0x52, 0x65, 0x73, 0x74, 0x20, 0x74, 0x6F, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x20, 0x6C, @@ -1935,12 +1935,12 @@ static const unsigned char helpDataPack[] = // log-level-console option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x03, // Section + 0x7B, 0x03, // Section 0x6C, 0x6F, 0x67, - pckTypeStr << 4 | 0x08, 0x1A, // Summary + 0x78, 0x1A, // Summary 0x4C, 0x65, 0x76, 0x65, 0x6C, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x63, 0x6F, 0x6E, 0x73, 0x6F, 0x6C, 0x65, 0x20, 0x6C, 0x6F, 0x67, 0x67, 0x69, 0x6E, 0x67, 0x2E, - pckTypeStr << 4 | 0x08, 0xF1, 0x02, // Description + 0x78, 0xF1, 0x02, // Description 0x54, 0x68, 0x65, 0x20, 0x66, 0x6F, 0x6C, 0x6C, 0x6F, 0x77, 0x69, 0x6E, 0x67, 0x20, 0x6C, 0x6F, 0x67, 0x20, 0x6C, 0x65, 0x76, 0x65, 0x6C, 0x73, 0x20, 0x61, 0x72, 0x65, 0x20, 0x73, 0x75, 0x70, 0x70, 0x6F, 0x72, 0x74, 0x65, 0x64, 0x3A, 0x0A, 0x0A, @@ -1966,12 +1966,12 @@ static const unsigned char helpDataPack[] = // log-level-file option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x03, // Section + 0x7B, 0x03, // Section 0x6C, 0x6F, 0x67, - pckTypeStr << 4 | 0x08, 0x17, // Summary + 0x78, 0x17, // Summary 0x4C, 0x65, 0x76, 0x65, 0x6C, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x66, 0x69, 0x6C, 0x65, 0x20, 0x6C, 0x6F, 0x67, 0x67, 0x69, 0x6E, 0x67, 0x2E, - pckTypeStr << 4 | 0x08, 0xF1, 0x02, // Description + 0x78, 0xF1, 0x02, // Description 0x54, 0x68, 0x65, 0x20, 0x66, 0x6F, 0x6C, 0x6C, 0x6F, 0x77, 0x69, 0x6E, 0x67, 0x20, 0x6C, 0x6F, 0x67, 0x20, 0x6C, 0x65, 0x76, 0x65, 0x6C, 0x73, 0x20, 0x61, 0x72, 0x65, 0x20, 0x73, 0x75, 0x70, 0x70, 0x6F, 0x72, 0x74, 0x65, 0x64, 0x3A, 0x0A, 0x0A, @@ -1997,12 +1997,12 @@ static const unsigned char helpDataPack[] = // log-level-stderr option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x03, // Section + 0x7B, 0x03, // Section 0x6C, 0x6F, 0x67, - pckTypeStr << 4 | 0x08, 0x19, // Summary + 0x78, 0x19, // Summary 0x4C, 0x65, 0x76, 0x65, 0x6C, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x73, 0x74, 0x64, 0x65, 0x72, 0x72, 0x20, 0x6C, 0x6F, 0x67, 0x67, 0x69, 0x6E, 0x67, 0x2E, - pckTypeStr << 4 | 0x08, 0x90, 0x04, // Description + 0x78, 0x90, 0x04, // Description 0x53, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x73, 0x20, 0x77, 0x68, 0x69, 0x63, 0x68, 0x20, 0x6C, 0x6F, 0x67, 0x20, 0x6C, 0x65, 0x76, 0x65, 0x6C, 0x73, 0x20, 0x77, 0x69, 0x6C, 0x6C, 0x20, 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x20, 0x74, 0x6F, 0x20, 0x73, 0x74, 0x64, 0x65, 0x72, 0x72, 0x20, 0x72, 0x61, 0x74, 0x68, 0x65, 0x72, 0x20, 0x74, 0x68, 0x61, 0x6E, @@ -2036,12 +2036,12 @@ static const unsigned char helpDataPack[] = // log-path option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x03, // Section + 0x7B, 0x03, // Section 0x6C, 0x6F, 0x67, - pckTypeStr << 4 | 0x08, 0x20, // Summary + 0x78, 0x20, // Summary 0x50, 0x61, 0x74, 0x68, 0x20, 0x77, 0x68, 0x65, 0x72, 0x65, 0x20, 0x6C, 0x6F, 0x67, 0x20, 0x66, 0x69, 0x6C, 0x65, 0x73, 0x20, 0x61, 0x72, 0x65, 0x20, 0x73, 0x74, 0x6F, 0x72, 0x65, 0x64, 0x2E, - pckTypeStr << 4 | 0x08, 0x81, 0x01, // Description + 0x78, 0x81, 0x01, // Description 0x54, 0x68, 0x65, 0x20, 0x6C, 0x6F, 0x67, 0x20, 0x70, 0x61, 0x74, 0x68, 0x20, 0x70, 0x72, 0x6F, 0x76, 0x69, 0x64, 0x65, 0x73, 0x20, 0x61, 0x20, 0x6C, 0x6F, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x70, 0x67, 0x42, 0x61, 0x63, 0x6B, 0x52, 0x65, 0x73, 0x74, 0x20, 0x74, 0x6F, 0x20, 0x73, 0x74, 0x6F, 0x72, 0x65, 0x20, 0x6C, 0x6F, 0x67, @@ -2052,12 +2052,12 @@ static const unsigned char helpDataPack[] = // log-subprocess option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x03, // Section + 0x7B, 0x03, // Section 0x6C, 0x6F, 0x67, - pckTypeStr << 4 | 0x08, 0x1F, // Summary + 0x78, 0x1F, // Summary 0x45, 0x6E, 0x61, 0x62, 0x6C, 0x65, 0x20, 0x6C, 0x6F, 0x67, 0x67, 0x69, 0x6E, 0x67, 0x20, 0x69, 0x6E, 0x20, 0x73, 0x75, 0x62, 0x70, 0x72, 0x6F, 0x63, 0x65, 0x73, 0x73, 0x65, 0x73, 0x2E, - pckTypeStr << 4 | 0x08, 0x71, // Description + 0x78, 0x71, // Description 0x45, 0x6E, 0x61, 0x62, 0x6C, 0x65, 0x20, 0x66, 0x69, 0x6C, 0x65, 0x20, 0x6C, 0x6F, 0x67, 0x67, 0x69, 0x6E, 0x67, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x61, 0x6E, 0x79, 0x20, 0x73, 0x75, 0x62, 0x70, 0x72, 0x6F, 0x63, 0x65, 0x73, 0x73, 0x65, 0x73, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x20, 0x62, 0x79, 0x20, 0x74, 0x68, 0x69, 0x73, 0x20, 0x70, 0x72, 0x6F, @@ -2067,12 +2067,12 @@ static const unsigned char helpDataPack[] = // log-timestamp option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x03, // Section + 0x7B, 0x03, // Section 0x6C, 0x6F, 0x67, - pckTypeStr << 4 | 0x08, 0x1C, // Summary + 0x78, 0x1C, // Summary 0x45, 0x6E, 0x61, 0x62, 0x6C, 0x65, 0x20, 0x74, 0x69, 0x6D, 0x65, 0x73, 0x74, 0x61, 0x6D, 0x70, 0x20, 0x69, 0x6E, 0x20, 0x6C, 0x6F, 0x67, 0x67, 0x69, 0x6E, 0x67, 0x2E, - pckTypeStr << 4 | 0x08, 0x82, 0x01, // Description + 0x78, 0x82, 0x01, // Description 0x45, 0x6E, 0x61, 0x62, 0x6C, 0x65, 0x73, 0x20, 0x74, 0x68, 0x65, 0x20, 0x74, 0x69, 0x6D, 0x65, 0x73, 0x74, 0x61, 0x6D, 0x70, 0x20, 0x69, 0x6E, 0x20, 0x63, 0x6F, 0x6E, 0x73, 0x6F, 0x6C, 0x65, 0x20, 0x61, 0x6E, 0x64, 0x20, 0x66, 0x69, 0x6C, 0x65, 0x20, 0x6C, 0x6F, 0x67, 0x67, 0x69, 0x6E, 0x67, 0x2E, 0x20, 0x54, 0x68, 0x69, 0x73, 0x20, 0x6F, 0x70, 0x74, 0x69, @@ -2083,12 +2083,12 @@ static const unsigned char helpDataPack[] = // manifest-save-threshold option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x06, // Section + 0x7B, 0x06, // Section 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, - pckTypeStr << 4 | 0x08, 0x26, // Summary + 0x78, 0x26, // Summary 0x4D, 0x61, 0x6E, 0x69, 0x66, 0x65, 0x73, 0x74, 0x20, 0x73, 0x61, 0x76, 0x65, 0x20, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68, 0x6F, 0x6C, 0x64, 0x20, 0x64, 0x75, 0x72, 0x69, 0x6E, 0x67, 0x20, 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x2E, - pckTypeStr << 4 | 0x08, 0x81, 0x03, // Description + 0x78, 0x81, 0x03, // Description 0x44, 0x65, 0x66, 0x69, 0x6E, 0x65, 0x73, 0x20, 0x68, 0x6F, 0x77, 0x20, 0x6F, 0x66, 0x74, 0x65, 0x6E, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6D, 0x61, 0x6E, 0x69, 0x66, 0x65, 0x73, 0x74, 0x20, 0x77, 0x69, 0x6C, 0x6C, 0x20, 0x62, 0x65, 0x20, 0x73, 0x61, 0x76, 0x65, 0x64, 0x20, 0x64, 0x75, 0x72, 0x69, 0x6E, 0x67, 0x20, 0x61, 0x20, 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, @@ -2113,11 +2113,11 @@ static const unsigned char helpDataPack[] = // neutral-umask option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x07, // Section + 0x7B, 0x07, // Section 0x67, 0x65, 0x6E, 0x65, 0x72, 0x61, 0x6C, - pckTypeStr << 4 | 0x08, 0x14, // Summary + 0x78, 0x14, // Summary 0x55, 0x73, 0x65, 0x20, 0x61, 0x20, 0x6E, 0x65, 0x75, 0x74, 0x72, 0x61, 0x6C, 0x20, 0x75, 0x6D, 0x61, 0x73, 0x6B, 0x2E, - pckTypeStr << 4 | 0x08, 0xEF, 0x02, // Description + 0x78, 0xEF, 0x02, // Description 0x53, 0x65, 0x74, 0x73, 0x20, 0x74, 0x68, 0x65, 0x20, 0x75, 0x6D, 0x61, 0x73, 0x6B, 0x20, 0x74, 0x6F, 0x20, 0x30, 0x30, 0x30, 0x30, 0x20, 0x73, 0x6F, 0x20, 0x6D, 0x6F, 0x64, 0x65, 0x73, 0x20, 0x69, 0x6E, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x20, 0x61, 0x72, 0x65, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, @@ -2140,13 +2140,13 @@ static const unsigned char helpDataPack[] = // online option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeArray << 4 | 0x07, // Command overrides begin + 0x17, // Command overrides begin - pckTypeObj << 4 | 0x02, // Command backup override begin - pckTypeStr << 4 | 0x09, 0x19, // Summary + 0x52, // Command backup override begin + 0x79, 0x19, // Summary 0x50, 0x65, 0x72, 0x66, 0x6F, 0x72, 0x6D, 0x20, 0x61, 0x6E, 0x20, 0x6F, 0x6E, 0x6C, 0x69, 0x6E, 0x65, 0x20, 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x2E, - pckTypeStr << 4 | 0x08, 0x86, 0x03, // Description + 0x78, 0x86, 0x03, // Description 0x53, 0x70, 0x65, 0x63, 0x69, 0x66, 0x79, 0x69, 0x6E, 0x67, 0x20, 0x2D, 0x2D, 0x6E, 0x6F, 0x2D, 0x6F, 0x6E, 0x6C, 0x69, 0x6E, 0x65, 0x20, 0x70, 0x72, 0x65, 0x76, 0x65, 0x6E, 0x74, 0x73, 0x20, 0x70, 0x67, 0x42, 0x61, 0x63, 0x6B, 0x52, 0x65, 0x73, 0x74, 0x20, 0x66, 0x72, 0x6F, 0x6D, 0x20, 0x72, 0x75, 0x6E, 0x6E, 0x69, 0x6E, @@ -2171,11 +2171,11 @@ static const unsigned char helpDataPack[] = 0x20, 0x66, 0x6F, 0x72, 0x20, 0x74, 0x68, 0x65, 0x20, 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x2E, 0x00, // Command backup override end - pckTypeObj << 4 | 0x0A, 0x01, // Command stanza-create override begin - pckTypeStr << 4 | 0x09, 0x1C, // Summary + 0x5A, 0x01, // Command stanza-create override begin + 0x79, 0x1C, // Summary 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x20, 0x6F, 0x6E, 0x20, 0x61, 0x6E, 0x20, 0x6F, 0x6E, 0x6C, 0x69, 0x6E, 0x65, 0x20, 0x63, 0x6C, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2E, - pckTypeStr << 4 | 0x08, 0x62, // Description + 0x78, 0x62, // Description 0x53, 0x70, 0x65, 0x63, 0x69, 0x66, 0x79, 0x69, 0x6E, 0x67, 0x20, 0x2D, 0x2D, 0x6E, 0x6F, 0x2D, 0x6F, 0x6E, 0x6C, 0x69, 0x6E, 0x65, 0x20, 0x70, 0x72, 0x65, 0x76, 0x65, 0x6E, 0x74, 0x73, 0x20, 0x70, 0x67, 0x42, 0x61, 0x63, 0x6B, 0x52, 0x65, 0x73, 0x74, 0x20, 0x66, 0x72, 0x6F, 0x6D, 0x20, 0x63, 0x6F, 0x6E, 0x6E, 0x65, 0x63, @@ -2184,11 +2184,11 @@ static const unsigned char helpDataPack[] = 0x20, 0x73, 0x74, 0x61, 0x6E, 0x7A, 0x61, 0x2E, 0x00, // Command stanza-create override end - pckTypeObj << 4 | 0x01, // Command stanza-upgrade override begin - pckTypeStr << 4 | 0x09, 0x19, // Summary + 0x51, // Command stanza-upgrade override begin + 0x79, 0x19, // Summary 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x20, 0x61, 0x6E, 0x20, 0x6F, 0x6E, 0x6C, 0x69, 0x6E, 0x65, 0x20, 0x63, 0x6C, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2E, - pckTypeStr << 4 | 0x08, 0x63, // Description + 0x78, 0x63, // Description 0x53, 0x70, 0x65, 0x63, 0x69, 0x66, 0x79, 0x69, 0x6E, 0x67, 0x20, 0x2D, 0x2D, 0x6E, 0x6F, 0x2D, 0x6F, 0x6E, 0x6C, 0x69, 0x6E, 0x65, 0x20, 0x70, 0x72, 0x65, 0x76, 0x65, 0x6E, 0x74, 0x73, 0x20, 0x70, 0x67, 0x42, 0x61, 0x63, 0x6B, 0x52, 0x65, 0x73, 0x74, 0x20, 0x66, 0x72, 0x6F, 0x6D, 0x20, 0x63, 0x6F, 0x6E, 0x6E, 0x65, 0x63, @@ -2201,12 +2201,12 @@ static const unsigned char helpDataPack[] = // output option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeArray << 4 | 0x05, // Command overrides begin + 0x15, // Command overrides begin - pckTypeObj << 4 | 0x06, // Command info override begin - pckTypeStr << 4 | 0x09, 0x0E, // Summary + 0x56, // Command info override begin + 0x79, 0x0E, // Summary 0x4F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x20, 0x66, 0x6F, 0x72, 0x6D, 0x61, 0x74, 0x2E, - pckTypeStr << 4 | 0x08, 0xA9, 0x01, // Description + 0x78, 0xA9, 0x01, // Description 0x54, 0x68, 0x65, 0x20, 0x66, 0x6F, 0x6C, 0x6C, 0x6F, 0x77, 0x69, 0x6E, 0x67, 0x20, 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x20, 0x74, 0x79, 0x70, 0x65, 0x73, 0x20, 0x61, 0x72, 0x65, 0x20, 0x73, 0x75, 0x70, 0x70, 0x6F, 0x72, 0x74, 0x65, 0x64, 0x3A, 0x0A, 0x0A, @@ -2220,10 +2220,10 @@ static const unsigned char helpDataPack[] = 0x6E, 0x20, 0x69, 0x6E, 0x20, 0x4A, 0x53, 0x4F, 0x4E, 0x20, 0x66, 0x6F, 0x72, 0x6D, 0x61, 0x74, 0x2E, 0x00, // Command info override end - pckTypeObj << 4 | 0x02, // Command repo-ls override begin - pckTypeStr << 4 | 0x09, 0x0E, // Summary + 0x52, // Command repo-ls override begin + 0x79, 0x0E, // Summary 0x4F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x20, 0x66, 0x6F, 0x72, 0x6D, 0x61, 0x74, 0x2E, - pckTypeStr << 4 | 0x08, 0xAE, 0x03, // Description + 0x78, 0xAE, 0x03, // Description 0x54, 0x68, 0x65, 0x20, 0x66, 0x6F, 0x6C, 0x6C, 0x6F, 0x77, 0x69, 0x6E, 0x67, 0x20, 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x20, 0x74, 0x79, 0x70, 0x65, 0x73, 0x20, 0x61, 0x72, 0x65, 0x20, 0x73, 0x75, 0x70, 0x70, 0x6F, 0x72, 0x74, 0x65, 0x64, 0x3A, 0x0A, 0x0A, @@ -2259,15 +2259,15 @@ static const unsigned char helpDataPack[] = // pg option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeBool << 4 | 0x08, // Internal + 0x28, // Internal // pg-database option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0E, 0x01, 0x06, // Section + 0x7E, 0x01, 0x06, // Section 0x73, 0x74, 0x61, 0x6E, 0x7A, 0x61, - pckTypeStr << 4 | 0x08, 0x14, // Summary + 0x78, 0x14, // Summary 0x50, 0x6F, 0x73, 0x74, 0x67, 0x72, 0x65, 0x53, 0x51, 0x4C, 0x20, 0x64, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x2E, - pckTypeStr << 4 | 0x08, 0xE9, 0x01, // Description + 0x78, 0xE9, 0x01, // Description 0x54, 0x68, 0x65, 0x20, 0x64, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x20, 0x6E, 0x61, 0x6D, 0x65, 0x20, 0x75, 0x73, 0x65, 0x64, 0x20, 0x77, 0x68, 0x65, 0x6E, 0x20, 0x63, 0x6F, 0x6E, 0x6E, 0x65, 0x63, 0x74, 0x69, 0x6E, 0x67, 0x20, 0x74, 0x6F, 0x20, 0x50, 0x6F, 0x73, 0x74, 0x67, 0x72, 0x65, 0x53, 0x51, 0x4C, 0x2E, 0x20, 0x54, 0x68, 0x65, 0x20, 0x64, 0x65, @@ -2283,49 +2283,49 @@ static const unsigned char helpDataPack[] = // pg-host option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x06, // Section + 0x7B, 0x06, // Section 0x73, 0x74, 0x61, 0x6E, 0x7A, 0x61, - pckTypeStr << 4 | 0x08, 0x2F, // Summary + 0x78, 0x2F, // Summary 0x50, 0x6F, 0x73, 0x74, 0x67, 0x72, 0x65, 0x53, 0x51, 0x4C, 0x20, 0x68, 0x6F, 0x73, 0x74, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x6F, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6E, 0x67, 0x20, 0x72, 0x65, 0x6D, 0x6F, 0x74, 0x65, 0x6C, 0x79, 0x20, 0x76, 0x69, 0x61, 0x20, 0x53, 0x53, 0x48, 0x2E, - pckTypeStr << 4 | 0x08, 0x51, // Description + 0x78, 0x51, // Description 0x55, 0x73, 0x65, 0x64, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x73, 0x20, 0x77, 0x68, 0x65, 0x72, 0x65, 0x20, 0x74, 0x68, 0x65, 0x20, 0x50, 0x6F, 0x73, 0x74, 0x67, 0x72, 0x65, 0x53, 0x51, 0x4C, 0x20, 0x68, 0x6F, 0x73, 0x74, 0x20, 0x69, 0x73, 0x20, 0x64, 0x69, 0x66, 0x66, 0x65, 0x72, 0x65, 0x6E, 0x74, 0x20, 0x66, 0x72, 0x6F, 0x6D, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x20, 0x68, 0x6F, 0x73, 0x74, 0x2E, - pckTypeArray << 4, // Deprecated names begin - pckTypeStr << 4 | 0x08, 0x07, // db-host + 0x10, // Deprecated names begin + 0x78, 0x07, // db-host 0x64, 0x62, 0x2D, 0x68, 0x6F, 0x73, 0x74, 0x00, // Deprecated names end - pckTypeArray << 4, // Command overrides begin + 0x10, // Command overrides begin - pckTypeObj << 4, // Command archive-get override begin - pckTypeBool << 4 | 0x08, // Internal + 0x50, // Command archive-get override begin + 0x28, // Internal 0x00, // Command archive-get override end - pckTypeObj << 4, // Command archive-push override begin - pckTypeBool << 4 | 0x08, // Internal + 0x50, // Command archive-push override begin + 0x28, // Internal 0x00, // Command archive-push override end - pckTypeObj << 4 | 0x0A, 0x01, // Command restore override begin - pckTypeBool << 4 | 0x08, // Internal + 0x5A, 0x01, // Command restore override begin + 0x28, // Internal 0x00, // Command restore override end 0x00, // Command overrides end // pg-host-cmd option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x09, 0x06, // Section + 0x79, 0x06, // Section 0x73, 0x74, 0x61, 0x6E, 0x7A, 0x61, - pckTypeStr << 4 | 0x08, 0x2B, // Summary + 0x78, 0x2B, // Summary 0x70, 0x67, 0x42, 0x61, 0x63, 0x6B, 0x52, 0x65, 0x73, 0x74, 0x20, 0x65, 0x78, 0x65, 0x20, 0x70, 0x61, 0x74, 0x68, 0x20, 0x6F, 0x6E, 0x20, 0x74, 0x68, 0x65, 0x20, 0x50, 0x6F, 0x73, 0x74, 0x67, 0x72, 0x65, 0x53, 0x51, 0x4C, 0x20, 0x68, 0x6F, 0x73, 0x74, 0x2E, - pckTypeStr << 4 | 0x08, 0xAE, 0x01, // Description + 0x78, 0xAE, 0x01, // Description 0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x20, 0x6F, 0x6E, 0x6C, 0x79, 0x20, 0x69, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x6F, 0x20, 0x70, 0x67, 0x62, 0x61, 0x63, 0x6B, 0x72, 0x65, 0x73, 0x74, 0x20, 0x69, 0x73, 0x20, 0x64, 0x69, 0x66, 0x66, 0x65, 0x72, 0x65, 0x6E, 0x74, 0x20, 0x6F, 0x6E, 0x20, 0x74, 0x68, 0x65, 0x20, @@ -2336,20 +2336,20 @@ static const unsigned char helpDataPack[] = 0x65, 0x74, 0x20, 0x74, 0x68, 0x65, 0x20, 0x73, 0x61, 0x6D, 0x65, 0x20, 0x61, 0x73, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6C, 0x6F, 0x63, 0x61, 0x6C, 0x20, 0x65, 0x78, 0x65, 0x20, 0x70, 0x61, 0x74, 0x68, 0x2E, - pckTypeArray << 4, // Deprecated names begin - pckTypeStr << 4 | 0x08, 0x06, // db-cmd + 0x10, // Deprecated names begin + 0x78, 0x06, // db-cmd 0x64, 0x62, 0x2D, 0x63, 0x6D, 0x64, 0x00, // Deprecated names end // pg-host-config option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0A, 0x06, // Section + 0x7A, 0x06, // Section 0x73, 0x74, 0x61, 0x6E, 0x7A, 0x61, - pckTypeStr << 4 | 0x08, 0x2C, // Summary + 0x78, 0x2C, // Summary 0x70, 0x67, 0x42, 0x61, 0x63, 0x6B, 0x52, 0x65, 0x73, 0x74, 0x20, 0x64, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x20, 0x68, 0x6F, 0x73, 0x74, 0x20, 0x63, 0x6F, 0x6E, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x66, 0x69, 0x6C, 0x65, 0x2E, - pckTypeStr << 4 | 0x08, 0xC1, 0x01, // Description + 0x78, 0xC1, 0x01, // Description 0x53, 0x65, 0x74, 0x73, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6C, 0x6F, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x6F, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 0x6F, 0x6E, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x66, 0x69, 0x6C, 0x65, 0x20, 0x6F, 0x6E, 0x20, 0x74, 0x68, 0x65, 0x20, 0x50, 0x6F, 0x73, 0x74, 0x67, 0x72, 0x65, 0x53, 0x51, @@ -2361,20 +2361,20 @@ static const unsigned char helpDataPack[] = 0x68, 0x61, 0x6E, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6C, 0x6F, 0x63, 0x61, 0x6C, 0x20, 0x63, 0x6F, 0x6E, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x66, 0x69, 0x6C, 0x65, 0x2E, - pckTypeArray << 4, // Deprecated names begin - pckTypeStr << 4 | 0x08, 0x09, // db-config + 0x10, // Deprecated names begin + 0x78, 0x09, // db-config 0x64, 0x62, 0x2D, 0x63, 0x6F, 0x6E, 0x66, 0x69, 0x67, 0x00, // Deprecated names end // pg-host-config-include-path option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0A, 0x06, // Section + 0x7A, 0x06, // Section 0x73, 0x74, 0x61, 0x6E, 0x7A, 0x61, - pckTypeStr << 4 | 0x08, 0x34, // Summary + 0x78, 0x34, // Summary 0x70, 0x67, 0x42, 0x61, 0x63, 0x6B, 0x52, 0x65, 0x73, 0x74, 0x20, 0x64, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x20, 0x68, 0x6F, 0x73, 0x74, 0x20, 0x63, 0x6F, 0x6E, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x69, 0x6E, 0x63, 0x6C, 0x75, 0x64, 0x65, 0x20, 0x70, 0x61, 0x74, 0x68, 0x2E, - pckTypeStr << 4 | 0x08, 0xD9, 0x01, // Description + 0x78, 0xD9, 0x01, // Description 0x53, 0x65, 0x74, 0x73, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6C, 0x6F, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x6F, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 0x6F, 0x6E, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x69, 0x6E, 0x63, 0x6C, 0x75, 0x64, 0x65, 0x20, 0x70, 0x61, 0x74, 0x68, 0x20, 0x6F, 0x6E, 0x20, 0x74, 0x68, 0x65, 0x20, 0x50, @@ -2389,13 +2389,13 @@ static const unsigned char helpDataPack[] = // pg-host-config-path option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x06, // Section + 0x7B, 0x06, // Section 0x73, 0x74, 0x61, 0x6E, 0x7A, 0x61, - pckTypeStr << 4 | 0x08, 0x2C, // Summary + 0x78, 0x2C, // Summary 0x70, 0x67, 0x42, 0x61, 0x63, 0x6B, 0x52, 0x65, 0x73, 0x74, 0x20, 0x64, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x20, 0x68, 0x6F, 0x73, 0x74, 0x20, 0x63, 0x6F, 0x6E, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x70, 0x61, 0x74, 0x68, 0x2E, - pckTypeStr << 4 | 0x08, 0xC1, 0x01, // Description + 0x78, 0xC1, 0x01, // Description 0x53, 0x65, 0x74, 0x73, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6C, 0x6F, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x6F, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 0x6F, 0x6E, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x70, 0x61, 0x74, 0x68, 0x20, 0x6F, 0x6E, 0x20, 0x74, 0x68, 0x65, 0x20, 0x50, 0x6F, 0x73, 0x74, 0x67, 0x72, 0x65, 0x53, 0x51, @@ -2409,13 +2409,13 @@ static const unsigned char helpDataPack[] = // pg-host-port option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x06, // Section + 0x7B, 0x06, // Section 0x73, 0x74, 0x61, 0x6E, 0x7A, 0x61, - pckTypeStr << 4 | 0x08, 0x29, // Summary + 0x78, 0x29, // Summary 0x50, 0x6F, 0x73, 0x74, 0x67, 0x72, 0x65, 0x53, 0x51, 0x4C, 0x20, 0x68, 0x6F, 0x73, 0x74, 0x20, 0x70, 0x6F, 0x72, 0x74, 0x20, 0x77, 0x68, 0x65, 0x6E, 0x20, 0x70, 0x67, 0x2D, 0x68, 0x6F, 0x73, 0x74, 0x20, 0x69, 0x73, 0x20, 0x73, 0x65, 0x74, 0x2E, - pckTypeStr << 4 | 0x08, 0x6F, // Description + 0x78, 0x6F, // Description 0x55, 0x73, 0x65, 0x20, 0x74, 0x68, 0x69, 0x73, 0x20, 0x6F, 0x70, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x74, 0x6F, 0x20, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x79, 0x20, 0x61, 0x20, 0x6E, 0x6F, 0x6E, 0x2D, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6C, 0x74, 0x20, 0x70, 0x6F, 0x72, 0x74, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x74, 0x68, 0x65, 0x20, 0x50, 0x6F, 0x73, 0x74, 0x67, 0x72, @@ -2423,20 +2423,20 @@ static const unsigned char helpDataPack[] = 0x43, 0x75, 0x72, 0x72, 0x65, 0x6E, 0x74, 0x6C, 0x79, 0x20, 0x6F, 0x6E, 0x6C, 0x79, 0x20, 0x53, 0x53, 0x48, 0x20, 0x69, 0x73, 0x20, 0x73, 0x75, 0x70, 0x70, 0x6F, 0x72, 0x74, 0x65, 0x64, - pckTypeArray << 4, // Deprecated names begin - pckTypeStr << 4 | 0x08, 0x0B, // db-ssh-port + 0x10, // Deprecated names begin + 0x78, 0x0B, // db-ssh-port 0x64, 0x62, 0x2D, 0x73, 0x73, 0x68, 0x2D, 0x70, 0x6F, 0x72, 0x74, 0x00, // Deprecated names end // pg-host-user option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0A, 0x06, // Section + 0x7A, 0x06, // Section 0x73, 0x74, 0x61, 0x6E, 0x7A, 0x61, - pckTypeStr << 4 | 0x08, 0x2F, // Summary + 0x78, 0x2F, // Summary 0x50, 0x6F, 0x73, 0x74, 0x67, 0x72, 0x65, 0x53, 0x51, 0x4C, 0x20, 0x68, 0x6F, 0x73, 0x74, 0x20, 0x6C, 0x6F, 0x67, 0x6F, 0x6E, 0x20, 0x75, 0x73, 0x65, 0x72, 0x20, 0x77, 0x68, 0x65, 0x6E, 0x20, 0x70, 0x67, 0x2D, 0x68, 0x6F, 0x73, 0x74, 0x20, 0x69, 0x73, 0x20, 0x73, 0x65, 0x74, 0x2E, - pckTypeStr << 4 | 0x08, 0xE0, 0x01, // Description + 0x78, 0xE0, 0x01, // Description 0x54, 0x68, 0x69, 0x73, 0x20, 0x75, 0x73, 0x65, 0x72, 0x20, 0x77, 0x69, 0x6C, 0x6C, 0x20, 0x61, 0x6C, 0x73, 0x6F, 0x20, 0x6F, 0x77, 0x6E, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x6D, 0x6F, 0x74, 0x65, 0x20, 0x70, 0x67, 0x42, 0x61, 0x63, 0x6B, 0x52, 0x65, 0x73, 0x74, 0x20, 0x70, 0x72, 0x6F, 0x63, 0x65, 0x73, 0x73, 0x20, 0x61, 0x6E, 0x64, 0x20, 0x77, 0x69, @@ -2450,19 +2450,19 @@ static const unsigned char helpDataPack[] = 0x79, 0x20, 0x70, 0x6F, 0x73, 0x74, 0x67, 0x72, 0x65, 0x73, 0x2C, 0x20, 0x74, 0x68, 0x65, 0x20, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6C, 0x74, 0x2E, - pckTypeArray << 4, // Deprecated names begin - pckTypeStr << 4 | 0x08, 0x07, // db-user + 0x10, // Deprecated names begin + 0x78, 0x07, // db-user 0x64, 0x62, 0x2D, 0x75, 0x73, 0x65, 0x72, 0x00, // Deprecated names end // pg-local option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeBool << 4 | 0x09, // Internal - pckTypeStr << 4 | 0x08, 0x06, // Section + 0x29, // Internal + 0x78, 0x06, // Section 0x73, 0x74, 0x61, 0x6E, 0x7A, 0x61, - pckTypeStr << 4 | 0x08, 0x14, // Summary + 0x78, 0x14, // Summary 0x50, 0x6F, 0x73, 0x74, 0x67, 0x72, 0x65, 0x53, 0x51, 0x4C, 0x20, 0x69, 0x73, 0x20, 0x6C, 0x6F, 0x63, 0x61, 0x6C, 0x2E, - pckTypeStr << 4 | 0x08, 0x8D, 0x01, // Description + 0x78, 0x8D, 0x01, // Description 0x49, 0x6E, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x20, 0x74, 0x68, 0x61, 0x74, 0x20, 0x50, 0x6F, 0x73, 0x74, 0x67, 0x72, 0x65, 0x53, 0x51, 0x4C, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x74, 0x68, 0x65, 0x20, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x64, 0x20, 0x69, 0x6E, 0x64, 0x65, 0x78, 0x20, 0x69, 0x73, 0x20, 0x6C, 0x6F, 0x63, 0x61, 0x6C, 0x20, 0x61, @@ -2474,12 +2474,12 @@ static const unsigned char helpDataPack[] = // pg-path option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x06, // Section + 0x7B, 0x06, // Section 0x73, 0x74, 0x61, 0x6E, 0x7A, 0x61, - pckTypeStr << 4 | 0x08, 0x1A, // Summary + 0x78, 0x1A, // Summary 0x50, 0x6F, 0x73, 0x74, 0x67, 0x72, 0x65, 0x53, 0x51, 0x4C, 0x20, 0x64, 0x61, 0x74, 0x61, 0x20, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6F, 0x72, 0x79, 0x2E, - pckTypeStr << 4 | 0x08, 0xFC, 0x02, // Description + 0x78, 0xFC, 0x02, // Description 0x54, 0x68, 0x69, 0x73, 0x20, 0x73, 0x68, 0x6F, 0x75, 0x6C, 0x64, 0x20, 0x62, 0x65, 0x20, 0x74, 0x68, 0x65, 0x20, 0x73, 0x61, 0x6D, 0x65, 0x20, 0x61, 0x73, 0x20, 0x74, 0x68, 0x65, 0x20, 0x64, 0x61, 0x74, 0x61, 0x5F, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6F, 0x72, 0x79, 0x20, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6E, 0x67, 0x20, 0x69, 0x6E, 0x20, 0x70, 0x6F, 0x73, @@ -2501,18 +2501,18 @@ static const unsigned char helpDataPack[] = 0x68, 0x6F, 0x75, 0x6C, 0x64, 0x20, 0x61, 0x6C, 0x77, 0x61, 0x79, 0x73, 0x20, 0x62, 0x65, 0x20, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6E, 0x74, 0x2E, - pckTypeArray << 4, // Deprecated names begin - pckTypeStr << 4 | 0x08, 0x07, // db-path + 0x10, // Deprecated names begin + 0x78, 0x07, // db-path 0x64, 0x62, 0x2D, 0x70, 0x61, 0x74, 0x68, 0x00, // Deprecated names end // pg-port option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0A, 0x06, // Section + 0x7A, 0x06, // Section 0x73, 0x74, 0x61, 0x6E, 0x7A, 0x61, - pckTypeStr << 4 | 0x08, 0x10, // Summary + 0x78, 0x10, // Summary 0x50, 0x6F, 0x73, 0x74, 0x67, 0x72, 0x65, 0x53, 0x51, 0x4C, 0x20, 0x70, 0x6F, 0x72, 0x74, 0x2E, - pckTypeStr << 4 | 0x08, 0x83, 0x01, // Description + 0x78, 0x83, 0x01, // Description 0x50, 0x6F, 0x72, 0x74, 0x20, 0x74, 0x68, 0x61, 0x74, 0x20, 0x50, 0x6F, 0x73, 0x74, 0x67, 0x72, 0x65, 0x53, 0x51, 0x4C, 0x20, 0x69, 0x73, 0x20, 0x72, 0x75, 0x6E, 0x6E, 0x69, 0x6E, 0x67, 0x20, 0x6F, 0x6E, 0x2E, 0x20, 0x54, 0x68, 0x69, 0x73, 0x20, 0x75, 0x73, 0x75, 0x61, 0x6C, 0x6C, 0x79, 0x20, 0x64, 0x6F, 0x65, 0x73, 0x20, 0x6E, 0x6F, 0x74, 0x20, 0x6E, 0x65, @@ -2521,19 +2521,19 @@ static const unsigned char helpDataPack[] = 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x20, 0x72, 0x75, 0x6E, 0x20, 0x6F, 0x6E, 0x20, 0x74, 0x68, 0x65, 0x20, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6C, 0x74, 0x20, 0x70, 0x6F, 0x72, 0x74, 0x2E, - pckTypeArray << 4, // Deprecated names begin - pckTypeStr << 4 | 0x08, 0x07, // db-port + 0x10, // Deprecated names begin + 0x78, 0x07, // db-port 0x64, 0x62, 0x2D, 0x70, 0x6F, 0x72, 0x74, 0x00, // Deprecated names end // pg-socket-path option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0A, 0x06, // Section + 0x7A, 0x06, // Section 0x73, 0x74, 0x61, 0x6E, 0x7A, 0x61, - pckTypeStr << 4 | 0x08, 0x1C, // Summary + 0x78, 0x1C, // Summary 0x50, 0x6F, 0x73, 0x74, 0x67, 0x72, 0x65, 0x53, 0x51, 0x4C, 0x20, 0x75, 0x6E, 0x69, 0x78, 0x20, 0x73, 0x6F, 0x63, 0x6B, 0x65, 0x74, 0x20, 0x70, 0x61, 0x74, 0x68, 0x2E, - pckTypeStr << 4 | 0x08, 0xB4, 0x02, // Description + 0x78, 0xB4, 0x02, // Description 0x54, 0x68, 0x65, 0x20, 0x75, 0x6E, 0x69, 0x78, 0x20, 0x73, 0x6F, 0x63, 0x6B, 0x65, 0x74, 0x20, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6F, 0x72, 0x79, 0x20, 0x74, 0x68, 0x61, 0x74, 0x20, 0x77, 0x61, 0x73, 0x20, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x64, 0x20, 0x77, 0x68, 0x65, 0x6E, 0x20, 0x50, 0x6F, 0x73, 0x74, 0x67, 0x72, 0x65, 0x53, 0x51, 0x4C, @@ -2551,19 +2551,19 @@ static const unsigned char helpDataPack[] = 0x20, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6E, 0x67, 0x20, 0x69, 0x6E, 0x20, 0x70, 0x6F, 0x73, 0x74, 0x67, 0x72, 0x65, 0x73, 0x71, 0x6C, 0x2E, 0x63, 0x6F, 0x6E, 0x66, 0x2E, - pckTypeArray << 4, // Deprecated names begin - pckTypeStr << 4 | 0x08, 0x0E, // db-socket-path + 0x10, // Deprecated names begin + 0x78, 0x0E, // db-socket-path 0x64, 0x62, 0x2D, 0x73, 0x6F, 0x63, 0x6B, 0x65, 0x74, 0x2D, 0x70, 0x61, 0x74, 0x68, 0x00, // Deprecated names end // pg-user option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0A, 0x06, // Section + 0x7A, 0x06, // Section 0x73, 0x74, 0x61, 0x6E, 0x7A, 0x61, - pckTypeStr << 4 | 0x08, 0x19, // Summary + 0x78, 0x19, // Summary 0x50, 0x6F, 0x73, 0x74, 0x67, 0x72, 0x65, 0x53, 0x51, 0x4C, 0x20, 0x64, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x20, 0x75, 0x73, 0x65, 0x72, 0x2E, - pckTypeStr << 4 | 0x08, 0x85, 0x01, // Description + 0x78, 0x85, 0x01, // Description 0x54, 0x68, 0x65, 0x20, 0x64, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x20, 0x75, 0x73, 0x65, 0x72, 0x20, 0x6E, 0x61, 0x6D, 0x65, 0x20, 0x75, 0x73, 0x65, 0x64, 0x20, 0x77, 0x68, 0x65, 0x6E, 0x20, 0x63, 0x6F, 0x6E, 0x6E, 0x65, 0x63, 0x74, 0x69, 0x6E, 0x67, 0x20, 0x74, 0x6F, 0x20, 0x50, 0x6F, 0x73, 0x74, 0x67, 0x72, 0x65, 0x53, 0x51, 0x4C, 0x2E, 0x20, 0x49, @@ -2574,17 +2574,17 @@ static const unsigned char helpDataPack[] = // process option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeBool << 4 | 0x0A, // Internal + 0x2A, // Internal // process-max option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0E, 0x01, 0x07, // Section + 0x7E, 0x01, 0x07, // Section 0x67, 0x65, 0x6E, 0x65, 0x72, 0x61, 0x6C, - pckTypeStr << 4 | 0x08, 0x2B, // Summary + 0x78, 0x2B, // Summary 0x4D, 0x61, 0x78, 0x20, 0x70, 0x72, 0x6F, 0x63, 0x65, 0x73, 0x73, 0x65, 0x73, 0x20, 0x74, 0x6F, 0x20, 0x75, 0x73, 0x65, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x63, 0x6F, 0x6D, 0x70, 0x72, 0x65, 0x73, 0x73, 0x2F, 0x74, 0x72, 0x61, 0x6E, 0x73, 0x66, 0x65, 0x72, 0x2E, - pckTypeStr << 4 | 0x08, 0x9A, 0x01, // Description + 0x78, 0x9A, 0x01, // Description 0x45, 0x61, 0x63, 0x68, 0x20, 0x70, 0x72, 0x6F, 0x63, 0x65, 0x73, 0x73, 0x20, 0x77, 0x69, 0x6C, 0x6C, 0x20, 0x70, 0x65, 0x72, 0x66, 0x6F, 0x72, 0x6D, 0x20, 0x63, 0x6F, 0x6D, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6F, 0x6E, 0x20, 0x61, 0x6E, 0x64, 0x20, 0x74, 0x72, 0x61, 0x6E, 0x73, 0x66, 0x65, 0x72, 0x20, 0x74, 0x6F, 0x20, 0x6D, 0x61, 0x6B, 0x65, 0x20, 0x74, @@ -2596,11 +2596,11 @@ static const unsigned char helpDataPack[] = // protocol-timeout option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x07, // Section + 0x7B, 0x07, // Section 0x67, 0x65, 0x6E, 0x65, 0x72, 0x61, 0x6C, - pckTypeStr << 4 | 0x08, 0x11, // Summary + 0x78, 0x11, // Summary 0x50, 0x72, 0x6F, 0x74, 0x6F, 0x63, 0x6F, 0x6C, 0x20, 0x74, 0x69, 0x6D, 0x65, 0x6F, 0x75, 0x74, 0x2E, - pckTypeStr << 4 | 0x08, 0x90, 0x02, // Description + 0x78, 0x90, 0x02, // Description 0x53, 0x65, 0x74, 0x73, 0x20, 0x74, 0x68, 0x65, 0x20, 0x74, 0x69, 0x6D, 0x65, 0x6F, 0x75, 0x74, 0x2C, 0x20, 0x69, 0x6E, 0x20, 0x73, 0x65, 0x63, 0x6F, 0x6E, 0x64, 0x73, 0x2C, 0x20, 0x74, 0x68, 0x61, 0x74, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6C, 0x6F, 0x63, 0x61, 0x6C, 0x20, 0x6F, 0x72, 0x20, 0x72, 0x65, 0x6D, 0x6F, 0x74, 0x65, 0x20, 0x70, 0x72, 0x6F, 0x63, 0x65, @@ -2618,12 +2618,12 @@ static const unsigned char helpDataPack[] = // raw option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x07, // Section + 0x7B, 0x07, // Section 0x67, 0x65, 0x6E, 0x65, 0x72, 0x61, 0x6C, - pckTypeStr << 4 | 0x08, 0x16, // Summary + 0x78, 0x16, // Summary 0x44, 0x6F, 0x20, 0x6E, 0x6F, 0x74, 0x20, 0x74, 0x72, 0x61, 0x6E, 0x73, 0x66, 0x6F, 0x72, 0x6D, 0x20, 0x64, 0x61, 0x74, 0x61, 0x2E, - pckTypeStr << 4 | 0x08, 0x4F, // Description + 0x78, 0x4F, // Description 0x44, 0x6F, 0x20, 0x6E, 0x6F, 0x74, 0x20, 0x74, 0x72, 0x61, 0x6E, 0x73, 0x66, 0x6F, 0x72, 0x6D, 0x20, 0x28, 0x69, 0x2E, 0x65, 0x2C, 0x20, 0x65, 0x6E, 0x63, 0x72, 0x79, 0x70, 0x74, 0x2C, 0x20, 0x64, 0x65, 0x63, 0x6F, 0x6D, 0x70, 0x72, 0x65, 0x73, 0x73, 0x2C, 0x20, 0x65, 0x74, 0x63, 0x2E, 0x29, 0x20, 0x64, 0x61, 0x74, 0x61, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x74, @@ -2631,12 +2631,12 @@ static const unsigned char helpDataPack[] = // recovery-option option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x07, // Section + 0x7B, 0x07, // Section 0x72, 0x65, 0x73, 0x74, 0x6F, 0x72, 0x65, - pckTypeStr << 4 | 0x08, 0x1F, // Summary + 0x78, 0x1F, // Summary 0x53, 0x65, 0x74, 0x20, 0x61, 0x6E, 0x20, 0x6F, 0x70, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x69, 0x6E, 0x20, 0x72, 0x65, 0x63, 0x6F, 0x76, 0x65, 0x72, 0x79, 0x2E, 0x63, 0x6F, 0x6E, 0x66, 0x2E, - pckTypeStr << 4 | 0x08, 0xC8, 0x05, // Description + 0x78, 0xC8, 0x05, // Description 0x53, 0x65, 0x65, 0x20, 0x68, 0x74, 0x74, 0x70, 0x3A, 0x2F, 0x2F, 0x77, 0x77, 0x77, 0x2E, 0x70, 0x6F, 0x73, 0x74, 0x67, 0x72, 0x65, 0x73, 0x71, 0x6C, 0x2E, 0x6F, 0x72, 0x67, 0x2F, 0x64, 0x6F, 0x63, 0x73, 0x2F, 0x58, 0x2E, 0x58, 0x2F, 0x73, 0x74, 0x61, 0x74, 0x69, 0x63, 0x2F, 0x72, 0x65, 0x63, 0x6F, 0x76, 0x65, 0x72, 0x79, 0x2D, 0x63, 0x6F, 0x6E, 0x66, 0x69, @@ -2677,24 +2677,24 @@ static const unsigned char helpDataPack[] = // recurse option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeArray << 4 | 0x07, // Command overrides begin + 0x17, // Command overrides begin - pckTypeObj << 4 | 0x09, 0x01, // Command repo-ls override begin - pckTypeStr << 4 | 0x09, 0x1F, // Summary + 0x59, 0x01, // Command repo-ls override begin + 0x79, 0x1F, // Summary 0x49, 0x6E, 0x63, 0x6C, 0x75, 0x64, 0x65, 0x20, 0x61, 0x6C, 0x6C, 0x20, 0x73, 0x75, 0x62, 0x70, 0x61, 0x74, 0x68, 0x73, 0x20, 0x69, 0x6E, 0x20, 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2E, - pckTypeStr << 4 | 0x08, 0x3C, // Description + 0x78, 0x3C, // Description 0x41, 0x6C, 0x6C, 0x20, 0x73, 0x75, 0x62, 0x70, 0x61, 0x74, 0x68, 0x73, 0x20, 0x61, 0x6E, 0x64, 0x20, 0x74, 0x68, 0x65, 0x69, 0x72, 0x20, 0x66, 0x69, 0x6C, 0x65, 0x73, 0x20, 0x77, 0x69, 0x6C, 0x6C, 0x20, 0x62, 0x65, 0x20, 0x69, 0x6E, 0x63, 0x6C, 0x75, 0x64, 0x65, 0x64, 0x20, 0x69, 0x6E, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2E, 0x00, // Command repo-ls override end - pckTypeObj << 4 | 0x01, // Command repo-rm override begin - pckTypeStr << 4 | 0x09, 0x1A, // Summary + 0x51, // Command repo-rm override begin + 0x79, 0x1A, // Summary 0x52, 0x65, 0x6D, 0x6F, 0x76, 0x65, 0x20, 0x61, 0x6C, 0x6C, 0x20, 0x73, 0x75, 0x62, 0x20, 0x66, 0x69, 0x6C, 0x65, 0x2F, 0x70, 0x61, 0x74, 0x68, 0x73, 0x2E, - pckTypeStr << 4 | 0x08, 0x2D, // Description + 0x78, 0x2D, // Description 0x41, 0x6C, 0x6C, 0x20, 0x73, 0x75, 0x62, 0x70, 0x61, 0x74, 0x68, 0x73, 0x20, 0x61, 0x6E, 0x64, 0x20, 0x74, 0x68, 0x65, 0x69, 0x72, 0x20, 0x66, 0x69, 0x6C, 0x65, 0x73, 0x20, 0x77, 0x69, 0x6C, 0x6C, 0x20, 0x62, 0x65, 0x20, 0x72, 0x65, 0x6D, 0x6F, 0x76, 0x65, 0x64, 0x2E, @@ -2704,15 +2704,15 @@ static const unsigned char helpDataPack[] = // remote-type option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeBool << 4 | 0x08, // Internal + 0x28, // Internal // repo option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0E, 0x01, 0x0A, // Section + 0x7E, 0x01, 0x0A, // Section 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, - pckTypeStr << 4 | 0x08, 0x0F, // Summary + 0x78, 0x0F, // Summary 0x53, 0x65, 0x74, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x2E, - pckTypeStr << 4 | 0x08, 0xAD, 0x01, // Description + 0x78, 0xAD, 0x01, // Description 0x53, 0x65, 0x74, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x61, 0x20, 0x63, 0x6F, 0x6D, 0x6D, 0x61, 0x6E, 0x64, 0x20, 0x74, 0x6F, 0x20, 0x6F, 0x70, 0x65, 0x72, 0x61, 0x74, 0x65, 0x20, 0x6F, 0x6E, 0x2E, 0x0A, 0x0A, @@ -2726,24 +2726,24 @@ static const unsigned char helpDataPack[] = // repo-azure-account option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x0A, // Section + 0x7B, 0x0A, // Section 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, - pckTypeStr << 4 | 0x08, 0x19, // Summary + 0x78, 0x19, // Summary 0x41, 0x7A, 0x75, 0x72, 0x65, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x20, 0x61, 0x63, 0x63, 0x6F, 0x75, 0x6E, 0x74, 0x2E, - pckTypeStr << 4 | 0x08, 0x2B, // Description + 0x78, 0x2B, // Description 0x41, 0x7A, 0x75, 0x72, 0x65, 0x20, 0x61, 0x63, 0x63, 0x6F, 0x75, 0x6E, 0x74, 0x20, 0x75, 0x73, 0x65, 0x64, 0x20, 0x74, 0x6F, 0x20, 0x73, 0x74, 0x6F, 0x72, 0x65, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x2E, // repo-azure-container option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x0A, // Section + 0x7B, 0x0A, // Section 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, - pckTypeStr << 4 | 0x08, 0x1B, // Summary + 0x78, 0x1B, // Summary 0x41, 0x7A, 0x75, 0x72, 0x65, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x20, 0x63, 0x6F, 0x6E, 0x74, 0x61, 0x69, 0x6E, 0x65, 0x72, 0x2E, - pckTypeStr << 4 | 0x08, 0x8B, 0x02, // Description + 0x78, 0x8B, 0x02, // Description 0x41, 0x7A, 0x75, 0x72, 0x65, 0x20, 0x63, 0x6F, 0x6E, 0x74, 0x61, 0x69, 0x6E, 0x65, 0x72, 0x20, 0x75, 0x73, 0x65, 0x64, 0x20, 0x74, 0x6F, 0x20, 0x73, 0x74, 0x6F, 0x72, 0x65, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x2E, 0x0A, 0x0A, @@ -2761,12 +2761,12 @@ static const unsigned char helpDataPack[] = // repo-azure-endpoint option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x0A, // Section + 0x7B, 0x0A, // Section 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, - pckTypeStr << 4 | 0x08, 0x1A, // Summary + 0x78, 0x1A, // Summary 0x41, 0x7A, 0x75, 0x72, 0x65, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x20, 0x65, 0x6E, 0x64, 0x70, 0x6F, 0x69, 0x6E, 0x74, 0x2E, - pckTypeStr << 4 | 0x08, 0x96, 0x02, // Description + 0x78, 0x96, 0x02, // Description 0x45, 0x6E, 0x64, 0x70, 0x6F, 0x69, 0x6E, 0x74, 0x20, 0x75, 0x73, 0x65, 0x64, 0x20, 0x74, 0x6F, 0x20, 0x63, 0x6F, 0x6E, 0x6E, 0x65, 0x63, 0x74, 0x20, 0x74, 0x6F, 0x20, 0x74, 0x68, 0x65, 0x20, 0x62, 0x6C, 0x6F, 0x62, 0x20, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2E, 0x20, 0x54, 0x68, 0x65, 0x20, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6C, 0x74, 0x20, 0x69, 0x73, @@ -2785,12 +2785,12 @@ static const unsigned char helpDataPack[] = // repo-azure-key option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x0A, // Section + 0x7B, 0x0A, // Section 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, - pckTypeStr << 4 | 0x08, 0x15, // Summary + 0x78, 0x15, // Summary 0x41, 0x7A, 0x75, 0x72, 0x65, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x20, 0x6B, 0x65, 0x79, 0x2E, - pckTypeStr << 4 | 0x08, 0x54, // Description + 0x78, 0x54, // Description 0x41, 0x20, 0x73, 0x68, 0x61, 0x72, 0x65, 0x64, 0x20, 0x6B, 0x65, 0x79, 0x20, 0x6F, 0x72, 0x20, 0x73, 0x68, 0x61, 0x72, 0x65, 0x64, 0x20, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x20, 0x73, 0x69, 0x67, 0x6E, 0x61, 0x74, 0x75, 0x72, 0x65, 0x20, 0x64, 0x65, 0x70, 0x65, 0x6E, 0x64, 0x69, 0x6E, 0x67, 0x20, 0x6F, 0x6E, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x70, @@ -2799,12 +2799,12 @@ static const unsigned char helpDataPack[] = // repo-azure-key-type option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x0A, // Section + 0x7B, 0x0A, // Section 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, - pckTypeStr << 4 | 0x08, 0x1A, // Summary + 0x78, 0x1A, // Summary 0x41, 0x7A, 0x75, 0x72, 0x65, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x20, 0x6B, 0x65, 0x79, 0x20, 0x74, 0x79, 0x70, 0x65, 0x2E, - pckTypeStr << 4 | 0x08, 0x6B, // Description + 0x78, 0x6B, // Description 0x54, 0x68, 0x65, 0x20, 0x66, 0x6F, 0x6C, 0x6C, 0x6F, 0x77, 0x69, 0x6E, 0x67, 0x20, 0x74, 0x79, 0x70, 0x65, 0x73, 0x20, 0x61, 0x72, 0x65, 0x20, 0x73, 0x75, 0x70, 0x70, 0x6F, 0x72, 0x74, 0x65, 0x64, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x61, 0x75, 0x74, 0x68, 0x6F, 0x72, 0x69, 0x7A, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x3A, 0x0A, 0x0A, @@ -2815,24 +2815,24 @@ static const unsigned char helpDataPack[] = // repo-cipher-pass option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x0A, // Section + 0x7B, 0x0A, // Section 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, - pckTypeStr << 4 | 0x08, 0x1D, // Summary + 0x78, 0x1D, // Summary 0x52, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x20, 0x63, 0x69, 0x70, 0x68, 0x65, 0x72, 0x20, 0x70, 0x61, 0x73, 0x73, 0x70, 0x68, 0x72, 0x61, 0x73, 0x65, 0x2E, - pckTypeStr << 4 | 0x08, 0x3B, // Description + 0x78, 0x3B, // Description 0x50, 0x61, 0x73, 0x73, 0x70, 0x68, 0x72, 0x61, 0x73, 0x65, 0x20, 0x75, 0x73, 0x65, 0x64, 0x20, 0x74, 0x6F, 0x20, 0x65, 0x6E, 0x63, 0x72, 0x79, 0x70, 0x74, 0x2F, 0x64, 0x65, 0x63, 0x72, 0x79, 0x70, 0x74, 0x20, 0x66, 0x69, 0x6C, 0x65, 0x73, 0x20, 0x6F, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x2E, // repo-cipher-type option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x0A, // Section + 0x7B, 0x0A, // Section 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, - pckTypeStr << 4 | 0x08, 0x26, // Summary + 0x78, 0x26, // Summary 0x43, 0x69, 0x70, 0x68, 0x65, 0x72, 0x20, 0x75, 0x73, 0x65, 0x64, 0x20, 0x74, 0x6F, 0x20, 0x65, 0x6E, 0x63, 0x72, 0x79, 0x70, 0x74, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x2E, - pckTypeStr << 4 | 0x08, 0x89, 0x02, // Description + 0x78, 0x89, 0x02, // Description 0x54, 0x68, 0x65, 0x20, 0x66, 0x6F, 0x6C, 0x6C, 0x6F, 0x77, 0x69, 0x6E, 0x67, 0x20, 0x63, 0x69, 0x70, 0x68, 0x65, 0x72, 0x20, 0x74, 0x79, 0x70, 0x65, 0x73, 0x20, 0x61, 0x72, 0x65, 0x20, 0x73, 0x75, 0x70, 0x70, 0x6F, 0x72, 0x74, 0x65, 0x64, 0x3A, 0x0A, 0x0A, @@ -2852,12 +2852,12 @@ static const unsigned char helpDataPack[] = // repo-gcs-bucket option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x0A, // Section + 0x7B, 0x0A, // Section 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, - pckTypeStr << 4 | 0x08, 0x16, // Summary + 0x78, 0x16, // Summary 0x47, 0x43, 0x53, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x20, 0x62, 0x75, 0x63, 0x6B, 0x65, 0x74, 0x2E, - pckTypeStr << 4 | 0x08, 0xFE, 0x01, // Description + 0x78, 0xFE, 0x01, // Description 0x47, 0x43, 0x53, 0x20, 0x62, 0x75, 0x63, 0x6B, 0x65, 0x74, 0x20, 0x75, 0x73, 0x65, 0x64, 0x20, 0x74, 0x6F, 0x20, 0x73, 0x74, 0x6F, 0x72, 0x65, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x2E, 0x0A, 0x0A, @@ -2875,12 +2875,12 @@ static const unsigned char helpDataPack[] = // repo-gcs-endpoint option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x0A, // Section + 0x7B, 0x0A, // Section 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, - pckTypeStr << 4 | 0x08, 0x18, // Summary + 0x78, 0x18, // Summary 0x47, 0x43, 0x53, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x20, 0x65, 0x6E, 0x64, 0x70, 0x6F, 0x69, 0x6E, 0x74, 0x2E, - pckTypeStr << 4 | 0x08, 0x70, // Description + 0x78, 0x70, // Description 0x45, 0x6E, 0x64, 0x70, 0x6F, 0x69, 0x6E, 0x74, 0x20, 0x75, 0x73, 0x65, 0x64, 0x20, 0x74, 0x6F, 0x20, 0x63, 0x6F, 0x6E, 0x6E, 0x65, 0x63, 0x74, 0x20, 0x74, 0x6F, 0x20, 0x74, 0x68, 0x65, 0x20, 0x73, 0x74, 0x6F, 0x72, 0x61, 0x67, 0x65, 0x20, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2E, 0x20, 0x4D, 0x61, 0x79, 0x20, 0x62, 0x65, 0x20, 0x75, 0x70, 0x64, 0x61, @@ -2890,11 +2890,11 @@ static const unsigned char helpDataPack[] = // repo-gcs-key option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x0A, // Section + 0x7B, 0x0A, // Section 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, - pckTypeStr << 4 | 0x08, 0x13, // Summary + 0x78, 0x13, // Summary 0x47, 0x43, 0x53, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x20, 0x6B, 0x65, 0x79, 0x2E, - pckTypeStr << 4 | 0x08, 0x46, // Description + 0x78, 0x46, // Description 0x41, 0x20, 0x74, 0x6F, 0x6B, 0x65, 0x6E, 0x20, 0x6F, 0x72, 0x20, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x20, 0x6B, 0x65, 0x79, 0x20, 0x66, 0x69, 0x6C, 0x65, 0x20, 0x64, 0x65, 0x70, 0x65, 0x6E, 0x64, 0x69, 0x6E, 0x67, 0x20, 0x6F, 0x6E, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x2D, 0x67, 0x63, 0x73, 0x2D, 0x6B, 0x65, 0x79, 0x2D, 0x74, 0x79, @@ -2902,12 +2902,12 @@ static const unsigned char helpDataPack[] = // repo-gcs-key-type option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x0A, // Section + 0x7B, 0x0A, // Section 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, - pckTypeStr << 4 | 0x08, 0x18, // Summary + 0x78, 0x18, // Summary 0x47, 0x43, 0x53, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x20, 0x6B, 0x65, 0x79, 0x20, 0x74, 0x79, 0x70, 0x65, 0x2E, - pckTypeStr << 4 | 0x08, 0xCC, 0x01, // Description + 0x78, 0xCC, 0x01, // Description 0x54, 0x68, 0x65, 0x20, 0x66, 0x6F, 0x6C, 0x6C, 0x6F, 0x77, 0x69, 0x6E, 0x67, 0x20, 0x74, 0x79, 0x70, 0x65, 0x73, 0x20, 0x61, 0x72, 0x65, 0x20, 0x73, 0x75, 0x70, 0x70, 0x6F, 0x72, 0x74, 0x65, 0x64, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x61, 0x75, 0x74, 0x68, 0x6F, 0x72, 0x69, 0x7A, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x3A, 0x0A, 0x0A, @@ -2923,13 +2923,13 @@ static const unsigned char helpDataPack[] = // repo-hardlink option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x0A, // Section + 0x7B, 0x0A, // Section 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, - pckTypeStr << 4 | 0x08, 0x31, // Summary + 0x78, 0x31, // Summary 0x48, 0x61, 0x72, 0x64, 0x6C, 0x69, 0x6E, 0x6B, 0x20, 0x66, 0x69, 0x6C, 0x65, 0x73, 0x20, 0x62, 0x65, 0x74, 0x77, 0x65, 0x65, 0x6E, 0x20, 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x73, 0x20, 0x69, 0x6E, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x2E, - pckTypeStr << 4 | 0x08, 0x99, 0x02, // Description + 0x78, 0x99, 0x02, // Description 0x45, 0x6E, 0x61, 0x62, 0x6C, 0x65, 0x20, 0x68, 0x61, 0x72, 0x64, 0x2D, 0x6C, 0x69, 0x6E, 0x6B, 0x69, 0x6E, 0x67, 0x20, 0x6F, 0x66, 0x20, 0x66, 0x69, 0x6C, 0x65, 0x73, 0x20, 0x69, 0x6E, 0x20, 0x64, 0x69, 0x66, 0x66, 0x65, 0x72, 0x65, 0x6E, 0x74, 0x69, 0x61, 0x6C, 0x20, 0x61, 0x6E, 0x64, 0x20, 0x69, 0x6E, 0x63, 0x72, 0x65, 0x6D, 0x65, 0x6E, 0x74, 0x61, 0x6C, @@ -2946,20 +2946,20 @@ static const unsigned char helpDataPack[] = 0x65, 0x20, 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x73, 0x20, 0x69, 0x6E, 0x20, 0x74, 0x68, 0x65, 0x20, 0x73, 0x65, 0x74, 0x2E, - pckTypeArray << 4, // Deprecated names begin - pckTypeStr << 4 | 0x08, 0x08, // hardlink + 0x10, // Deprecated names begin + 0x78, 0x08, // hardlink 0x68, 0x61, 0x72, 0x64, 0x6C, 0x69, 0x6E, 0x6B, 0x00, // Deprecated names end // repo-host option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0A, 0x0A, // Section + 0x7A, 0x0A, // Section 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, - pckTypeStr << 4 | 0x08, 0x30, // Summary + 0x78, 0x30, // Summary 0x52, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x20, 0x68, 0x6F, 0x73, 0x74, 0x20, 0x77, 0x68, 0x65, 0x6E, 0x20, 0x6F, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6E, 0x67, 0x20, 0x72, 0x65, 0x6D, 0x6F, 0x74, 0x65, 0x6C, 0x79, 0x20, 0x76, 0x69, 0x61, 0x20, 0x53, 0x53, 0x48, 0x2E, - pckTypeStr << 4 | 0x08, 0xC9, 0x01, // Description + 0x78, 0xC9, 0x01, // Description 0x4D, 0x61, 0x6B, 0x65, 0x20, 0x73, 0x75, 0x72, 0x65, 0x20, 0x74, 0x68, 0x61, 0x74, 0x20, 0x74, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x20, 0x53, 0x53, 0x48, 0x20, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6E, 0x74, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x69, 0x73, 0x20, 0x63, 0x6F, 0x6E, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x64, 0x20, 0x62, 0x65, 0x74, 0x77, @@ -2972,44 +2972,44 @@ static const unsigned char helpDataPack[] = 0x6D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x20, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6E, 0x67, 0x20, 0x69, 0x73, 0x20, 0x6E, 0x6F, 0x74, 0x20, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x2E, - pckTypeArray << 4, // Deprecated names begin - pckTypeStr << 4 | 0x08, 0x0B, // backup-host + 0x10, // Deprecated names begin + 0x78, 0x0B, // backup-host 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x2D, 0x68, 0x6F, 0x73, 0x74, 0x00, // Deprecated names end - pckTypeArray << 4, // Command overrides begin + 0x10, // Command overrides begin - pckTypeObj << 4 | 0x02, // Command backup override begin - pckTypeBool << 4 | 0x08, // Internal + 0x52, // Command backup override begin + 0x28, // Internal 0x00, // Command backup override end - pckTypeObj << 4 | 0x01, // Command expire override begin - pckTypeBool << 4 | 0x08, // Internal + 0x51, // Command expire override begin + 0x28, // Internal 0x00, // Command expire override end - pckTypeObj << 4 | 0x08, 0x01, // Command stanza-create override begin - pckTypeBool << 4 | 0x08, // Internal + 0x58, 0x01, // Command stanza-create override begin + 0x28, // Internal 0x00, // Command stanza-create override end - pckTypeObj << 4, // Command stanza-delete override begin - pckTypeBool << 4 | 0x08, // Internal + 0x50, // Command stanza-delete override begin + 0x28, // Internal 0x00, // Command stanza-delete override end - pckTypeObj << 4, // Command stanza-upgrade override begin - pckTypeBool << 4 | 0x08, // Internal + 0x50, // Command stanza-upgrade override begin + 0x28, // Internal 0x00, // Command stanza-upgrade override end 0x00, // Command overrides end // repo-host-cmd option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x09, 0x0A, // Section + 0x79, 0x0A, // Section 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, - pckTypeStr << 4 | 0x08, 0x2B, // Summary + 0x78, 0x2B, // Summary 0x70, 0x67, 0x42, 0x61, 0x63, 0x6B, 0x52, 0x65, 0x73, 0x74, 0x20, 0x65, 0x78, 0x65, 0x20, 0x70, 0x61, 0x74, 0x68, 0x20, 0x6F, 0x6E, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x20, 0x68, 0x6F, 0x73, 0x74, 0x2E, - pckTypeStr << 4 | 0x08, 0xB0, 0x01, // Description + 0x78, 0xB0, 0x01, // Description 0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x20, 0x6F, 0x6E, 0x6C, 0x79, 0x20, 0x69, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x6F, 0x20, 0x70, 0x67, 0x62, 0x61, 0x63, 0x6B, 0x72, 0x65, 0x73, 0x74, 0x20, 0x69, 0x73, 0x20, 0x64, 0x69, 0x66, 0x66, 0x65, 0x72, 0x65, 0x6E, 0x74, 0x20, 0x6F, 0x6E, 0x20, 0x74, 0x68, 0x65, 0x20, @@ -3020,20 +3020,20 @@ static const unsigned char helpDataPack[] = 0x20, 0x73, 0x65, 0x74, 0x20, 0x74, 0x68, 0x65, 0x20, 0x73, 0x61, 0x6D, 0x65, 0x20, 0x61, 0x73, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6C, 0x6F, 0x63, 0x61, 0x6C, 0x20, 0x65, 0x78, 0x65, 0x20, 0x70, 0x61, 0x74, 0x68, 0x2E, - pckTypeArray << 4, // Deprecated names begin - pckTypeStr << 4 | 0x08, 0x0A, // backup-cmd + 0x10, // Deprecated names begin + 0x78, 0x0A, // backup-cmd 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x2D, 0x63, 0x6D, 0x64, 0x00, // Deprecated names end // repo-host-config option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0A, 0x0A, // Section + 0x7A, 0x0A, // Section 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, - pckTypeStr << 4 | 0x08, 0x2E, // Summary + 0x78, 0x2E, // Summary 0x70, 0x67, 0x42, 0x61, 0x63, 0x6B, 0x52, 0x65, 0x73, 0x74, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x20, 0x68, 0x6F, 0x73, 0x74, 0x20, 0x63, 0x6F, 0x6E, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x66, 0x69, 0x6C, 0x65, 0x2E, - pckTypeStr << 4 | 0x08, 0xC1, 0x01, // Description + 0x78, 0xC1, 0x01, // Description 0x53, 0x65, 0x74, 0x73, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6C, 0x6F, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x6F, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 0x6F, 0x6E, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x66, 0x69, 0x6C, 0x65, 0x20, 0x6F, 0x6E, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, @@ -3045,20 +3045,20 @@ static const unsigned char helpDataPack[] = 0x68, 0x61, 0x6E, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6C, 0x6F, 0x63, 0x61, 0x6C, 0x20, 0x63, 0x6F, 0x6E, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x66, 0x69, 0x6C, 0x65, 0x2E, - pckTypeArray << 4, // Deprecated names begin - pckTypeStr << 4 | 0x08, 0x0D, // backup-config + 0x10, // Deprecated names begin + 0x78, 0x0D, // backup-config 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x2D, 0x63, 0x6F, 0x6E, 0x66, 0x69, 0x67, 0x00, // Deprecated names end // repo-host-config-include-path option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0A, 0x0A, // Section + 0x7A, 0x0A, // Section 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, - pckTypeStr << 4 | 0x08, 0x36, // Summary + 0x78, 0x36, // Summary 0x70, 0x67, 0x42, 0x61, 0x63, 0x6B, 0x52, 0x65, 0x73, 0x74, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x20, 0x68, 0x6F, 0x73, 0x74, 0x20, 0x63, 0x6F, 0x6E, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x69, 0x6E, 0x63, 0x6C, 0x75, 0x64, 0x65, 0x20, 0x70, 0x61, 0x74, 0x68, 0x2E, - pckTypeStr << 4 | 0x08, 0xD9, 0x01, // Description + 0x78, 0xD9, 0x01, // Description 0x53, 0x65, 0x74, 0x73, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6C, 0x6F, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x6F, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 0x6F, 0x6E, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x69, 0x6E, 0x63, 0x6C, 0x75, 0x64, 0x65, 0x20, 0x70, 0x61, 0x74, 0x68, 0x20, 0x6F, 0x6E, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, @@ -3073,13 +3073,13 @@ static const unsigned char helpDataPack[] = // repo-host-config-path option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x0A, // Section + 0x7B, 0x0A, // Section 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, - pckTypeStr << 4 | 0x08, 0x2E, // Summary + 0x78, 0x2E, // Summary 0x70, 0x67, 0x42, 0x61, 0x63, 0x6B, 0x52, 0x65, 0x73, 0x74, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x20, 0x68, 0x6F, 0x73, 0x74, 0x20, 0x63, 0x6F, 0x6E, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x70, 0x61, 0x74, 0x68, 0x2E, - pckTypeStr << 4 | 0x08, 0xC1, 0x01, // Description + 0x78, 0xC1, 0x01, // Description 0x53, 0x65, 0x74, 0x73, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6C, 0x6F, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x6F, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 0x6F, 0x6E, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x70, 0x61, 0x74, 0x68, 0x20, 0x6F, 0x6E, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, @@ -3093,13 +3093,13 @@ static const unsigned char helpDataPack[] = // repo-host-port option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x0A, // Section + 0x7B, 0x0A, // Section 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, - pckTypeStr << 4 | 0x08, 0x2B, // Summary + 0x78, 0x2B, // Summary 0x52, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x20, 0x68, 0x6F, 0x73, 0x74, 0x20, 0x70, 0x6F, 0x72, 0x74, 0x20, 0x77, 0x68, 0x65, 0x6E, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x2D, 0x68, 0x6F, 0x73, 0x74, 0x20, 0x69, 0x73, 0x20, 0x73, 0x65, 0x74, 0x2E, - pckTypeStr << 4 | 0x08, 0x6F, // Description + 0x78, 0x6F, // Description 0x55, 0x73, 0x65, 0x20, 0x74, 0x68, 0x69, 0x73, 0x20, 0x6F, 0x70, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x74, 0x6F, 0x20, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x79, 0x20, 0x61, 0x20, 0x6E, 0x6F, 0x6E, 0x2D, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6C, 0x74, 0x20, 0x70, 0x6F, 0x72, 0x74, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, @@ -3107,20 +3107,20 @@ static const unsigned char helpDataPack[] = 0x43, 0x75, 0x72, 0x72, 0x65, 0x6E, 0x74, 0x6C, 0x79, 0x20, 0x6F, 0x6E, 0x6C, 0x79, 0x20, 0x53, 0x53, 0x48, 0x20, 0x69, 0x73, 0x20, 0x73, 0x75, 0x70, 0x70, 0x6F, 0x72, 0x74, 0x65, 0x64, - pckTypeArray << 4, // Deprecated names begin - pckTypeStr << 4 | 0x08, 0x0F, // backup-ssh-port + 0x10, // Deprecated names begin + 0x78, 0x0F, // backup-ssh-port 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x2D, 0x73, 0x73, 0x68, 0x2D, 0x70, 0x6F, 0x72, 0x74, 0x00, // Deprecated names end // repo-host-user option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0A, 0x0A, // Section + 0x7A, 0x0A, // Section 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, - pckTypeStr << 4 | 0x08, 0x2B, // Summary + 0x78, 0x2B, // Summary 0x52, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x20, 0x68, 0x6F, 0x73, 0x74, 0x20, 0x75, 0x73, 0x65, 0x72, 0x20, 0x77, 0x68, 0x65, 0x6E, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x2D, 0x68, 0x6F, 0x73, 0x74, 0x20, 0x69, 0x73, 0x20, 0x73, 0x65, 0x74, 0x2E, - pckTypeStr << 4 | 0x08, 0xE5, 0x02, // Description + 0x78, 0xE5, 0x02, // Description 0x44, 0x65, 0x66, 0x69, 0x6E, 0x65, 0x73, 0x20, 0x74, 0x68, 0x65, 0x20, 0x75, 0x73, 0x65, 0x72, 0x20, 0x74, 0x68, 0x61, 0x74, 0x20, 0x77, 0x69, 0x6C, 0x6C, 0x20, 0x62, 0x65, 0x20, 0x75, 0x73, 0x65, 0x64, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x6F, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x73, 0x20, 0x6F, 0x6E, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x70, @@ -3140,19 +3140,19 @@ static const unsigned char helpDataPack[] = 0x20, 0x74, 0x6F, 0x20, 0x64, 0x61, 0x6D, 0x61, 0x67, 0x65, 0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 0x6F, 0x6E, 0x74, 0x65, 0x6E, 0x74, 0x73, 0x20, 0x61, 0x63, 0x63, 0x69, 0x64, 0x65, 0x6E, 0x74, 0x61, 0x6C, 0x6C, 0x79, 0x2E, - pckTypeArray << 4, // Deprecated names begin - pckTypeStr << 4 | 0x08, 0x0B, // backup-user + 0x10, // Deprecated names begin + 0x78, 0x0B, // backup-user 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x2D, 0x75, 0x73, 0x65, 0x72, 0x00, // Deprecated names end // repo-local option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeBool << 4 | 0x09, // Internal - pckTypeStr << 4 | 0x08, 0x0A, // Section + 0x29, // Internal + 0x78, 0x0A, // Section 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, - pckTypeStr << 4 | 0x08, 0x14, // Summary + 0x78, 0x14, // Summary 0x52, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x20, 0x69, 0x73, 0x20, 0x6C, 0x6F, 0x63, 0x61, 0x6C, 0x2E, - pckTypeStr << 4 | 0x08, 0x93, 0x01, // Description + 0x78, 0x93, 0x01, // Description 0x49, 0x6E, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x20, 0x74, 0x68, 0x61, 0x74, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x74, 0x68, 0x65, 0x20, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x64, 0x20, 0x69, 0x6E, 0x64, 0x65, 0x78, 0x20, 0x69, 0x73, 0x20, 0x6C, 0x6F, 0x63, @@ -3164,13 +3164,13 @@ static const unsigned char helpDataPack[] = // repo-path option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x0A, // Section + 0x7B, 0x0A, // Section 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, - pckTypeStr << 4 | 0x08, 0x2A, // Summary + 0x78, 0x2A, // Summary 0x50, 0x61, 0x74, 0x68, 0x20, 0x77, 0x68, 0x65, 0x72, 0x65, 0x20, 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x73, 0x20, 0x61, 0x6E, 0x64, 0x20, 0x61, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x20, 0x61, 0x72, 0x65, 0x20, 0x73, 0x74, 0x6F, 0x72, 0x65, 0x64, 0x2E, - pckTypeStr << 4 | 0x08, 0xC9, 0x03, // Description + 0x78, 0xC9, 0x03, // Description 0x54, 0x68, 0x65, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x20, 0x69, 0x73, 0x20, 0x77, 0x68, 0x65, 0x72, 0x65, 0x20, 0x70, 0x67, 0x42, 0x61, 0x63, 0x6B, 0x52, 0x65, 0x73, 0x74, 0x20, 0x73, 0x74, 0x6F, 0x72, 0x65, 0x73, 0x20, 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x73, 0x20, 0x61, 0x6E, 0x64, 0x20, 0x61, 0x72, 0x63, 0x68, 0x69, 0x76, @@ -3197,13 +3197,13 @@ static const unsigned char helpDataPack[] = // repo-retention-archive option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x0A, // Section + 0x7B, 0x0A, // Section 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, - pckTypeStr << 4 | 0x08, 0x34, // Summary + 0x78, 0x34, // Summary 0x4E, 0x75, 0x6D, 0x62, 0x65, 0x72, 0x20, 0x6F, 0x66, 0x20, 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x73, 0x20, 0x77, 0x6F, 0x72, 0x74, 0x68, 0x20, 0x6F, 0x66, 0x20, 0x63, 0x6F, 0x6E, 0x74, 0x69, 0x6E, 0x75, 0x6F, 0x75, 0x73, 0x20, 0x57, 0x41, 0x4C, 0x20, 0x74, 0x6F, 0x20, 0x72, 0x65, 0x74, 0x61, 0x69, 0x6E, 0x2E, - pckTypeStr << 4 | 0x08, 0xF1, 0x07, // Description + 0x78, 0xF1, 0x07, // Description 0x4E, 0x4F, 0x54, 0x45, 0x3A, 0x20, 0x57, 0x41, 0x4C, 0x20, 0x73, 0x65, 0x67, 0x6D, 0x65, 0x6E, 0x74, 0x73, 0x20, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x20, 0x74, 0x6F, 0x20, 0x6D, 0x61, 0x6B, 0x65, 0x20, 0x61, 0x20, 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x20, 0x63, 0x6F, 0x6E, 0x73, 0x69, 0x73, 0x74, 0x65, 0x6E, 0x74, 0x20, 0x61, 0x72, 0x65, 0x20, @@ -3256,19 +3256,19 @@ static const unsigned char helpDataPack[] = 0x65, 0x64, 0x20, 0x57, 0x41, 0x4C, 0x20, 0x61, 0x6E, 0x64, 0x20, 0x69, 0x73, 0x20, 0x74, 0x68, 0x65, 0x72, 0x65, 0x66, 0x6F, 0x72, 0x65, 0x20, 0x6E, 0x6F, 0x74, 0x20, 0x72, 0x65, 0x63, 0x6F, 0x6D, 0x6D, 0x65, 0x6E, 0x64, 0x65, 0x64, 0x2E, - pckTypeArray << 4, // Deprecated names begin - pckTypeStr << 4 | 0x08, 0x11, // retention-archive + 0x10, // Deprecated names begin + 0x78, 0x11, // retention-archive 0x72, 0x65, 0x74, 0x65, 0x6E, 0x74, 0x69, 0x6F, 0x6E, 0x2D, 0x61, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x00, // Deprecated names end // repo-retention-archive-type option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0A, 0x0A, // Section + 0x7A, 0x0A, // Section 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, - pckTypeStr << 4 | 0x08, 0x1E, // Summary + 0x78, 0x1E, // Summary 0x42, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x20, 0x74, 0x79, 0x70, 0x65, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x57, 0x41, 0x4C, 0x20, 0x72, 0x65, 0x74, 0x65, 0x6E, 0x74, 0x69, 0x6F, 0x6E, 0x2E, - pckTypeStr << 4 | 0x08, 0xAB, 0x05, // Description + 0x78, 0xAB, 0x05, // Description 0x49, 0x66, 0x20, 0x73, 0x65, 0x74, 0x20, 0x74, 0x6F, 0x20, 0x66, 0x75, 0x6C, 0x6C, 0x20, 0x70, 0x67, 0x42, 0x61, 0x63, 0x6B, 0x52, 0x65, 0x73, 0x74, 0x20, 0x77, 0x69, 0x6C, 0x6C, 0x20, 0x6B, 0x65, 0x65, 0x70, 0x20, 0x61, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x20, 0x6C, 0x6F, 0x67, 0x73, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6E, 0x75, 0x6D, @@ -3305,21 +3305,21 @@ static const unsigned char helpDataPack[] = 0x20, 0x65, 0x78, 0x70, 0x69, 0x72, 0x69, 0x6E, 0x67, 0x20, 0x66, 0x75, 0x6C, 0x6C, 0x20, 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x73, 0x2E, - pckTypeArray << 4, // Deprecated names begin - pckTypeStr << 4 | 0x08, 0x16, // retention-archive-type + 0x10, // Deprecated names begin + 0x78, 0x16, // retention-archive-type 0x72, 0x65, 0x74, 0x65, 0x6E, 0x74, 0x69, 0x6F, 0x6E, 0x2D, 0x61, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x2D, 0x74, 0x79, 0x70, 0x65, 0x00, // Deprecated names end // repo-retention-diff option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0A, 0x0A, // Section + 0x7A, 0x0A, // Section 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, - pckTypeStr << 4 | 0x08, 0x29, // Summary + 0x78, 0x29, // Summary 0x4E, 0x75, 0x6D, 0x62, 0x65, 0x72, 0x20, 0x6F, 0x66, 0x20, 0x64, 0x69, 0x66, 0x66, 0x65, 0x72, 0x65, 0x6E, 0x74, 0x69, 0x61, 0x6C, 0x20, 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x73, 0x20, 0x74, 0x6F, 0x20, 0x72, 0x65, 0x74, 0x61, 0x69, 0x6E, 0x2E, - pckTypeStr << 4 | 0x08, 0xDA, 0x01, // Description + 0x78, 0xDA, 0x01, // Description 0x57, 0x68, 0x65, 0x6E, 0x20, 0x61, 0x20, 0x64, 0x69, 0x66, 0x66, 0x65, 0x72, 0x65, 0x6E, 0x74, 0x69, 0x61, 0x6C, 0x20, 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x20, 0x65, 0x78, 0x70, 0x69, 0x72, 0x65, 0x73, 0x2C, 0x20, 0x61, 0x6C, 0x6C, 0x20, 0x69, 0x6E, 0x63, 0x72, 0x65, 0x6D, 0x65, 0x6E, 0x74, 0x61, 0x6C, 0x20, 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x73, 0x20, @@ -3332,19 +3332,19 @@ static const unsigned char helpDataPack[] = 0x68, 0x65, 0x20, 0x66, 0x75, 0x6C, 0x6C, 0x20, 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x73, 0x20, 0x74, 0x68, 0x65, 0x79, 0x20, 0x64, 0x65, 0x70, 0x65, 0x6E, 0x64, 0x20, 0x6F, 0x6E, 0x20, 0x65, 0x78, 0x70, 0x69, 0x72, 0x65, 0x2E, - pckTypeArray << 4, // Deprecated names begin - pckTypeStr << 4 | 0x08, 0x0E, // retention-diff + 0x10, // Deprecated names begin + 0x78, 0x0E, // retention-diff 0x72, 0x65, 0x74, 0x65, 0x6E, 0x74, 0x69, 0x6F, 0x6E, 0x2D, 0x64, 0x69, 0x66, 0x66, 0x00, // Deprecated names end // repo-retention-full option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0A, 0x0A, // Section + 0x7A, 0x0A, // Section 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, - pckTypeStr << 4 | 0x08, 0x21, // Summary + 0x78, 0x21, // Summary 0x46, 0x75, 0x6C, 0x6C, 0x20, 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x20, 0x72, 0x65, 0x74, 0x65, 0x6E, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x63, 0x6F, 0x75, 0x6E, 0x74, 0x2F, 0x74, 0x69, 0x6D, 0x65, 0x2E, - pckTypeStr << 4 | 0x08, 0xF8, 0x01, // Description + 0x78, 0xF8, 0x01, // Description 0x57, 0x68, 0x65, 0x6E, 0x20, 0x61, 0x20, 0x66, 0x75, 0x6C, 0x6C, 0x20, 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x20, 0x65, 0x78, 0x70, 0x69, 0x72, 0x65, 0x73, 0x2C, 0x20, 0x61, 0x6C, 0x6C, 0x20, 0x64, 0x69, 0x66, 0x66, 0x65, 0x72, 0x65, 0x6E, 0x74, 0x69, 0x61, 0x6C, 0x20, 0x61, 0x6E, 0x64, 0x20, 0x69, 0x6E, 0x63, 0x72, 0x65, 0x6D, 0x65, 0x6E, 0x74, 0x61, 0x6C, @@ -3359,19 +3359,19 @@ static const unsigned char helpDataPack[] = 0x74, 0x68, 0x65, 0x20, 0x6F, 0x70, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x74, 0x6F, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6D, 0x61, 0x78, 0x20, 0x76, 0x61, 0x6C, 0x75, 0x65, 0x2E, - pckTypeArray << 4, // Deprecated names begin - pckTypeStr << 4 | 0x08, 0x0E, // retention-full + 0x10, // Deprecated names begin + 0x78, 0x0E, // retention-full 0x72, 0x65, 0x74, 0x65, 0x6E, 0x74, 0x69, 0x6F, 0x6E, 0x2D, 0x66, 0x75, 0x6C, 0x6C, 0x00, // Deprecated names end // repo-retention-full-type option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0A, 0x0A, // Section + 0x7A, 0x0A, // Section 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, - pckTypeStr << 4 | 0x08, 0x20, // Summary + 0x78, 0x20, // Summary 0x52, 0x65, 0x74, 0x65, 0x6E, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x74, 0x79, 0x70, 0x65, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x66, 0x75, 0x6C, 0x6C, 0x20, 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x73, 0x2E, - pckTypeStr << 4 | 0x08, 0xC4, 0x06, // Description + 0x78, 0xC4, 0x06, // Description 0x44, 0x65, 0x74, 0x65, 0x72, 0x6D, 0x69, 0x6E, 0x65, 0x73, 0x20, 0x77, 0x68, 0x65, 0x74, 0x68, 0x65, 0x72, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x2D, 0x72, 0x65, 0x74, 0x65, 0x6E, 0x74, 0x69, 0x6F, 0x6E, 0x2D, 0x66, 0x75, 0x6C, 0x6C, 0x20, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6E, 0x67, 0x20, 0x72, 0x65, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6E, 0x74, @@ -3417,13 +3417,13 @@ static const unsigned char helpDataPack[] = // repo-retention-history option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x0A, // Section + 0x7B, 0x0A, // Section 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, - pckTypeStr << 4 | 0x08, 0x2B, // Summary + 0x78, 0x2B, // Summary 0x44, 0x61, 0x79, 0x73, 0x20, 0x6F, 0x66, 0x20, 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x20, 0x68, 0x69, 0x73, 0x74, 0x6F, 0x72, 0x79, 0x20, 0x6D, 0x61, 0x6E, 0x69, 0x66, 0x65, 0x73, 0x74, 0x73, 0x20, 0x74, 0x6F, 0x20, 0x72, 0x65, 0x74, 0x61, 0x69, 0x6E, 0x2E, - pckTypeStr << 4 | 0x08, 0xE6, 0x04, // Description + 0x78, 0xE6, 0x04, // Description 0x41, 0x20, 0x63, 0x6F, 0x70, 0x79, 0x20, 0x6F, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x20, 0x6D, 0x61, 0x6E, 0x69, 0x66, 0x65, 0x73, 0x74, 0x20, 0x69, 0x73, 0x20, 0x73, 0x74, 0x6F, 0x72, 0x65, 0x64, 0x20, 0x69, 0x6E, 0x20, 0x74, 0x68, 0x65, 0x20, 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x2E, 0x68, 0x69, 0x73, 0x74, 0x6F, 0x72, @@ -3460,12 +3460,12 @@ static const unsigned char helpDataPack[] = // repo-s3-bucket option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x0A, // Section + 0x7B, 0x0A, // Section 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, - pckTypeStr << 4 | 0x08, 0x15, // Summary + 0x78, 0x15, // Summary 0x53, 0x33, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x20, 0x62, 0x75, 0x63, 0x6B, 0x65, 0x74, 0x2E, - pckTypeStr << 4 | 0x08, 0xFD, 0x01, // Description + 0x78, 0xFD, 0x01, // Description 0x53, 0x33, 0x20, 0x62, 0x75, 0x63, 0x6B, 0x65, 0x74, 0x20, 0x75, 0x73, 0x65, 0x64, 0x20, 0x74, 0x6F, 0x20, 0x73, 0x74, 0x6F, 0x72, 0x65, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x2E, 0x0A, 0x0A, @@ -3483,12 +3483,12 @@ static const unsigned char helpDataPack[] = // repo-s3-endpoint option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x0A, // Section + 0x7B, 0x0A, // Section 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, - pckTypeStr << 4 | 0x08, 0x17, // Summary + 0x78, 0x17, // Summary 0x53, 0x33, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x20, 0x65, 0x6E, 0x64, 0x70, 0x6F, 0x69, 0x6E, 0x74, 0x2E, - pckTypeStr << 4 | 0x08, 0xE2, 0x01, // Description + 0x78, 0xE2, 0x01, // Description 0x54, 0x68, 0x65, 0x20, 0x41, 0x57, 0x53, 0x20, 0x65, 0x6E, 0x64, 0x70, 0x6F, 0x69, 0x6E, 0x74, 0x20, 0x73, 0x68, 0x6F, 0x75, 0x6C, 0x64, 0x20, 0x62, 0x65, 0x20, 0x76, 0x61, 0x6C, 0x69, 0x64, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x74, 0x68, 0x65, 0x20, 0x73, 0x65, 0x6C, 0x65, 0x63, 0x74, 0x65, 0x64, 0x20, 0x72, 0x65, 0x67, 0x69, 0x6F, 0x6E, 0x2E, 0x0A, 0x0A, @@ -3504,35 +3504,35 @@ static const unsigned char helpDataPack[] = // repo-s3-key option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x0A, // Section + 0x7B, 0x0A, // Section 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, - pckTypeStr << 4 | 0x08, 0x19, // Summary + 0x78, 0x19, // Summary 0x53, 0x33, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x20, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x20, 0x6B, 0x65, 0x79, 0x2E, - pckTypeStr << 4 | 0x08, 0x23, // Description + 0x78, 0x23, // Description 0x41, 0x57, 0x53, 0x20, 0x6B, 0x65, 0x79, 0x20, 0x75, 0x73, 0x65, 0x64, 0x20, 0x74, 0x6F, 0x20, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x20, 0x74, 0x68, 0x69, 0x73, 0x20, 0x62, 0x75, 0x63, 0x6B, 0x65, 0x74, 0x2E, // repo-s3-key-secret option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x0A, // Section + 0x7B, 0x0A, // Section 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, - pckTypeStr << 4 | 0x08, 0x20, // Summary + 0x78, 0x20, // Summary 0x53, 0x33, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x20, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x20, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x20, 0x6B, 0x65, 0x79, 0x2E, - pckTypeStr << 4 | 0x08, 0x2A, // Description + 0x78, 0x2A, // Description 0x41, 0x57, 0x53, 0x20, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x20, 0x6B, 0x65, 0x79, 0x20, 0x75, 0x73, 0x65, 0x64, 0x20, 0x74, 0x6F, 0x20, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x20, 0x74, 0x68, 0x69, 0x73, 0x20, 0x62, 0x75, 0x63, 0x6B, 0x65, 0x74, 0x2E, // repo-s3-key-type option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x0A, // Section + 0x7B, 0x0A, // Section 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, - pckTypeStr << 4 | 0x08, 0x17, // Summary + 0x78, 0x17, // Summary 0x53, 0x33, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x20, 0x6B, 0x65, 0x79, 0x20, 0x74, 0x79, 0x70, 0x65, 0x2E, - pckTypeStr << 4 | 0x08, 0x70, // Description + 0x78, 0x70, // Description 0x54, 0x68, 0x65, 0x20, 0x66, 0x6F, 0x6C, 0x6C, 0x6F, 0x77, 0x69, 0x6E, 0x67, 0x20, 0x74, 0x79, 0x70, 0x65, 0x73, 0x20, 0x61, 0x72, 0x65, 0x20, 0x73, 0x75, 0x70, 0x70, 0x6F, 0x72, 0x74, 0x65, 0x64, 0x3A, 0x0A, 0x0A, 0x2A, 0x20, 0x73, 0x68, 0x61, 0x72, 0x65, 0x64, 0x20, 0x2D, 0x20, 0x53, 0x68, 0x61, 0x72, 0x65, 0x64, 0x20, 0x6B, 0x65, @@ -3543,23 +3543,23 @@ static const unsigned char helpDataPack[] = // repo-s3-region option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x0A, // Section + 0x7B, 0x0A, // Section 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, - pckTypeStr << 4 | 0x08, 0x15, // Summary + 0x78, 0x15, // Summary 0x53, 0x33, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x20, 0x72, 0x65, 0x67, 0x69, 0x6F, 0x6E, 0x2E, - pckTypeStr << 4 | 0x08, 0x2C, // Description + 0x78, 0x2C, // Description 0x54, 0x68, 0x65, 0x20, 0x41, 0x57, 0x53, 0x20, 0x72, 0x65, 0x67, 0x69, 0x6F, 0x6E, 0x20, 0x77, 0x68, 0x65, 0x72, 0x65, 0x20, 0x74, 0x68, 0x65, 0x20, 0x62, 0x75, 0x63, 0x6B, 0x65, 0x74, 0x20, 0x77, 0x61, 0x73, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x2E, // repo-s3-role option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x0A, // Section + 0x7B, 0x0A, // Section 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, - pckTypeStr << 4 | 0x08, 0x13, // Summary + 0x78, 0x13, // Summary 0x53, 0x33, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x20, 0x72, 0x6F, 0x6C, 0x65, 0x2E, - pckTypeStr << 4 | 0x08, 0x67, // Description + 0x78, 0x67, // Description 0x54, 0x68, 0x65, 0x20, 0x41, 0x57, 0x53, 0x20, 0x72, 0x6F, 0x6C, 0x65, 0x20, 0x6E, 0x61, 0x6D, 0x65, 0x20, 0x28, 0x6E, 0x6F, 0x74, 0x20, 0x74, 0x68, 0x65, 0x20, 0x66, 0x75, 0x6C, 0x6C, 0x20, 0x41, 0x52, 0x4E, 0x29, 0x20, 0x75, 0x73, 0x65, 0x64, 0x20, 0x74, 0x6F, 0x20, 0x72, 0x65, 0x74, 0x72, 0x69, 0x65, 0x76, 0x65, 0x20, 0x74, 0x65, 0x6D, 0x70, 0x6F, 0x72, @@ -3569,23 +3569,23 @@ static const unsigned char helpDataPack[] = // repo-s3-token option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x0A, // Section + 0x7B, 0x0A, // Section 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, - pckTypeStr << 4 | 0x08, 0x1D, // Summary + 0x78, 0x1D, // Summary 0x53, 0x33, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x20, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x20, 0x74, 0x6F, 0x6B, 0x65, 0x6E, 0x2E, - pckTypeStr << 4 | 0x08, 0x33, // Description + 0x78, 0x33, // Description 0x41, 0x57, 0x53, 0x20, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x20, 0x74, 0x6F, 0x6B, 0x65, 0x6E, 0x20, 0x75, 0x73, 0x65, 0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x74, 0x65, 0x6D, 0x70, 0x6F, 0x72, 0x61, 0x72, 0x79, 0x20, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6E, 0x74, 0x69, 0x61, 0x6C, 0x73, 0x2E, // repo-s3-uri-style option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x0A, // Section + 0x7B, 0x0A, // Section 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, - pckTypeStr << 4 | 0x08, 0x0D, // Summary + 0x78, 0x0D, // Summary 0x53, 0x33, 0x20, 0x55, 0x52, 0x49, 0x20, 0x53, 0x74, 0x79, 0x6C, 0x65, 0x2E, - pckTypeStr << 4 | 0x08, 0x90, 0x01, // Description + 0x78, 0x90, 0x01, // Description 0x54, 0x68, 0x65, 0x20, 0x66, 0x6F, 0x6C, 0x6C, 0x6F, 0x77, 0x69, 0x6E, 0x67, 0x20, 0x55, 0x52, 0x49, 0x20, 0x73, 0x74, 0x79, 0x6C, 0x65, 0x73, 0x20, 0x61, 0x72, 0x65, 0x20, 0x73, 0x75, 0x70, 0x70, 0x6F, 0x72, 0x74, 0x65, 0x64, 0x3A, 0x0A, 0x0A, @@ -3599,54 +3599,54 @@ static const unsigned char helpDataPack[] = // repo-storage-ca-file option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x0A, // Section + 0x7B, 0x0A, // Section 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, - pckTypeStr << 4 | 0x08, 0x1B, // Summary + 0x78, 0x1B, // Summary 0x52, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x20, 0x73, 0x74, 0x6F, 0x72, 0x61, 0x67, 0x65, 0x20, 0x43, 0x41, 0x20, 0x66, 0x69, 0x6C, 0x65, 0x2E, - pckTypeStr << 4 | 0x08, 0x56, // Description + 0x78, 0x56, // Description 0x55, 0x73, 0x65, 0x20, 0x61, 0x20, 0x43, 0x41, 0x20, 0x66, 0x69, 0x6C, 0x65, 0x20, 0x6F, 0x74, 0x68, 0x65, 0x72, 0x20, 0x74, 0x68, 0x61, 0x6E, 0x20, 0x74, 0x68, 0x65, 0x20, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6D, 0x20, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6C, 0x74, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x73, 0x74, 0x6F, 0x72, 0x61, 0x67, 0x65, 0x20, 0x28, 0x65, 0x2E, 0x67, 0x2E, 0x20, 0x53, 0x33, 0x2C, 0x20, 0x41, 0x7A, 0x75, 0x72, 0x65, 0x29, 0x20, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x2E, - pckTypeArray << 4, // Deprecated names begin - pckTypeStr << 4 | 0x08, 0x12, // repo-azure-ca-file + 0x10, // Deprecated names begin + 0x78, 0x12, // repo-azure-ca-file 0x72, 0x65, 0x70, 0x6F, 0x2D, 0x61, 0x7A, 0x75, 0x72, 0x65, 0x2D, 0x63, 0x61, 0x2D, 0x66, 0x69, 0x6C, 0x65, - pckTypeStr << 4 | 0x08, 0x0F, // repo-s3-ca-file + 0x78, 0x0F, // repo-s3-ca-file 0x72, 0x65, 0x70, 0x6F, 0x2D, 0x73, 0x33, 0x2D, 0x63, 0x61, 0x2D, 0x66, 0x69, 0x6C, 0x65, 0x00, // Deprecated names end // repo-storage-ca-path option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0A, 0x0A, // Section + 0x7A, 0x0A, // Section 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, - pckTypeStr << 4 | 0x08, 0x1B, // Summary + 0x78, 0x1B, // Summary 0x52, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x20, 0x73, 0x74, 0x6F, 0x72, 0x61, 0x67, 0x65, 0x20, 0x43, 0x41, 0x20, 0x70, 0x61, 0x74, 0x68, 0x2E, - pckTypeStr << 4 | 0x08, 0x56, // Description + 0x78, 0x56, // Description 0x55, 0x73, 0x65, 0x20, 0x61, 0x20, 0x43, 0x41, 0x20, 0x70, 0x61, 0x74, 0x68, 0x20, 0x6F, 0x74, 0x68, 0x65, 0x72, 0x20, 0x74, 0x68, 0x61, 0x6E, 0x20, 0x74, 0x68, 0x65, 0x20, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6D, 0x20, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6C, 0x74, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x73, 0x74, 0x6F, 0x72, 0x61, 0x67, 0x65, 0x20, 0x28, 0x65, 0x2E, 0x67, 0x2E, 0x20, 0x53, 0x33, 0x2C, 0x20, 0x41, 0x7A, 0x75, 0x72, 0x65, 0x29, 0x20, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x2E, - pckTypeArray << 4, // Deprecated names begin - pckTypeStr << 4 | 0x08, 0x12, // repo-azure-ca-path + 0x10, // Deprecated names begin + 0x78, 0x12, // repo-azure-ca-path 0x72, 0x65, 0x70, 0x6F, 0x2D, 0x61, 0x7A, 0x75, 0x72, 0x65, 0x2D, 0x63, 0x61, 0x2D, 0x70, 0x61, 0x74, 0x68, - pckTypeStr << 4 | 0x08, 0x0F, // repo-s3-ca-path + 0x78, 0x0F, // repo-s3-ca-path 0x72, 0x65, 0x70, 0x6F, 0x2D, 0x73, 0x33, 0x2D, 0x63, 0x61, 0x2D, 0x70, 0x61, 0x74, 0x68, 0x00, // Deprecated names end // repo-storage-host option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0A, 0x0A, // Section + 0x7A, 0x0A, // Section 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, - pckTypeStr << 4 | 0x08, 0x18, // Summary + 0x78, 0x18, // Summary 0x52, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x20, 0x73, 0x74, 0x6F, 0x72, 0x61, 0x67, 0x65, 0x20, 0x68, 0x6F, 0x73, 0x74, 0x2E, - pckTypeStr << 4 | 0x08, 0x67, // Description + 0x78, 0x67, // Description 0x43, 0x6F, 0x6E, 0x6E, 0x65, 0x63, 0x74, 0x20, 0x74, 0x6F, 0x20, 0x61, 0x20, 0x68, 0x6F, 0x73, 0x74, 0x20, 0x6F, 0x74, 0x68, 0x65, 0x72, 0x20, 0x74, 0x68, 0x61, 0x6E, 0x20, 0x74, 0x68, 0x65, 0x20, 0x73, 0x74, 0x6F, 0x72, 0x61, 0x67, 0x65, 0x20, 0x28, 0x65, 0x2E, 0x67, 0x2E, 0x20, 0x53, 0x33, 0x2C, 0x20, 0x41, 0x7A, 0x75, 0x72, 0x65, 0x29, 0x20, 0x65, 0x6E, @@ -3654,42 +3654,42 @@ static const unsigned char helpDataPack[] = 0x63, 0x61, 0x6C, 0x6C, 0x79, 0x20, 0x75, 0x73, 0x65, 0x64, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x74, 0x65, 0x73, 0x74, 0x69, 0x6E, 0x67, 0x2E, - pckTypeArray << 4, // Deprecated names begin - pckTypeStr << 4 | 0x08, 0x0F, // repo-azure-host + 0x10, // Deprecated names begin + 0x78, 0x0F, // repo-azure-host 0x72, 0x65, 0x70, 0x6F, 0x2D, 0x61, 0x7A, 0x75, 0x72, 0x65, 0x2D, 0x68, 0x6F, 0x73, 0x74, - pckTypeStr << 4 | 0x08, 0x0C, // repo-s3-host + 0x78, 0x0C, // repo-s3-host 0x72, 0x65, 0x70, 0x6F, 0x2D, 0x73, 0x33, 0x2D, 0x68, 0x6F, 0x73, 0x74, 0x00, // Deprecated names end // repo-storage-port option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0A, 0x0A, // Section + 0x7A, 0x0A, // Section 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, - pckTypeStr << 4 | 0x08, 0x18, // Summary + 0x78, 0x18, // Summary 0x52, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x20, 0x73, 0x74, 0x6F, 0x72, 0x61, 0x67, 0x65, 0x20, 0x70, 0x6F, 0x72, 0x74, 0x2E, - pckTypeStr << 4 | 0x08, 0x5C, // Description + 0x78, 0x5C, // Description 0x50, 0x6F, 0x72, 0x74, 0x20, 0x74, 0x6F, 0x20, 0x75, 0x73, 0x65, 0x20, 0x77, 0x68, 0x65, 0x6E, 0x20, 0x63, 0x6F, 0x6E, 0x6E, 0x65, 0x63, 0x74, 0x69, 0x6E, 0x67, 0x20, 0x74, 0x6F, 0x20, 0x74, 0x68, 0x65, 0x20, 0x73, 0x74, 0x6F, 0x72, 0x61, 0x67, 0x65, 0x20, 0x28, 0x65, 0x2E, 0x67, 0x2E, 0x20, 0x53, 0x33, 0x2C, 0x20, 0x41, 0x7A, 0x75, 0x72, 0x65, 0x29, 0x20, 0x65, 0x6E, 0x64, 0x70, 0x6F, 0x69, 0x6E, 0x74, 0x20, 0x28, 0x6F, 0x72, 0x20, 0x68, 0x6F, 0x73, 0x74, 0x20, 0x69, 0x66, 0x20, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x64, 0x29, 0x2E, - pckTypeArray << 4, // Deprecated names begin - pckTypeStr << 4 | 0x08, 0x0F, // repo-azure-port + 0x10, // Deprecated names begin + 0x78, 0x0F, // repo-azure-port 0x72, 0x65, 0x70, 0x6F, 0x2D, 0x61, 0x7A, 0x75, 0x72, 0x65, 0x2D, 0x70, 0x6F, 0x72, 0x74, - pckTypeStr << 4 | 0x08, 0x0C, // repo-s3-port + 0x78, 0x0C, // repo-s3-port 0x72, 0x65, 0x70, 0x6F, 0x2D, 0x73, 0x33, 0x2D, 0x70, 0x6F, 0x72, 0x74, 0x00, // Deprecated names end // repo-storage-verify-tls option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0A, 0x0A, // Section + 0x7A, 0x0A, // Section 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, - pckTypeStr << 4 | 0x08, 0x26, // Summary + 0x78, 0x26, // Summary 0x52, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x20, 0x73, 0x74, 0x6F, 0x72, 0x61, 0x67, 0x65, 0x20, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x20, 0x76, 0x65, 0x72, 0x69, 0x66, 0x79, 0x2E, - pckTypeStr << 4 | 0x08, 0xDE, 0x01, // Description + 0x78, 0xDE, 0x01, // Description 0x54, 0x68, 0x69, 0x73, 0x20, 0x6F, 0x70, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x70, 0x72, 0x6F, 0x76, 0x69, 0x64, 0x65, 0x73, 0x20, 0x74, 0x68, 0x65, 0x20, 0x61, 0x62, 0x69, 0x6C, 0x69, 0x74, 0x79, 0x20, 0x74, 0x6F, 0x20, 0x65, 0x6E, 0x61, 0x62, 0x6C, 0x65, 0x2F, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6C, 0x65, 0x20, 0x76, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, @@ -3703,24 +3703,24 @@ static const unsigned char helpDataPack[] = 0x20, 0x68, 0x61, 0x73, 0x20, 0x62, 0x65, 0x65, 0x6E, 0x20, 0x73, 0x65, 0x6C, 0x66, 0x2D, 0x73, 0x69, 0x67, 0x6E, 0x65, 0x64, 0x2E, - pckTypeArray << 4, // Deprecated names begin - pckTypeStr << 4 | 0x08, 0x15, // repo-azure-verify-tls + 0x10, // Deprecated names begin + 0x78, 0x15, // repo-azure-verify-tls 0x72, 0x65, 0x70, 0x6F, 0x2D, 0x61, 0x7A, 0x75, 0x72, 0x65, 0x2D, 0x76, 0x65, 0x72, 0x69, 0x66, 0x79, 0x2D, 0x74, 0x6C, 0x73, - pckTypeStr << 4 | 0x08, 0x12, // repo-s3-verify-ssl + 0x78, 0x12, // repo-s3-verify-ssl 0x72, 0x65, 0x70, 0x6F, 0x2D, 0x73, 0x33, 0x2D, 0x76, 0x65, 0x72, 0x69, 0x66, 0x79, 0x2D, 0x73, 0x73, 0x6C, - pckTypeStr << 4 | 0x08, 0x12, // repo-s3-verify-tls + 0x78, 0x12, // repo-s3-verify-tls 0x72, 0x65, 0x70, 0x6F, 0x2D, 0x73, 0x33, 0x2D, 0x76, 0x65, 0x72, 0x69, 0x66, 0x79, 0x2D, 0x74, 0x6C, 0x73, 0x00, // Deprecated names end // repo-type option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0A, 0x0A, // Section + 0x7A, 0x0A, // Section 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, - pckTypeStr << 4 | 0x08, 0x28, // Summary + 0x78, 0x28, // Summary 0x54, 0x79, 0x70, 0x65, 0x20, 0x6F, 0x66, 0x20, 0x73, 0x74, 0x6F, 0x72, 0x61, 0x67, 0x65, 0x20, 0x75, 0x73, 0x65, 0x64, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x2E, - pckTypeStr << 4 | 0x08, 0xA5, 0x03, // Description + 0x78, 0xA5, 0x03, // Description 0x54, 0x68, 0x65, 0x20, 0x66, 0x6F, 0x6C, 0x6C, 0x6F, 0x77, 0x69, 0x6E, 0x67, 0x20, 0x72, 0x65, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x6F, 0x72, 0x79, 0x20, 0x74, 0x79, 0x70, 0x65, 0x73, 0x20, 0x61, 0x72, 0x65, 0x20, 0x73, 0x75, 0x70, 0x70, 0x6F, 0x72, 0x74, 0x65, 0x64, 0x3A, 0x0A, 0x0A, @@ -3748,12 +3748,12 @@ static const unsigned char helpDataPack[] = // resume option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x06, // Section + 0x7B, 0x06, // Section 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, - pckTypeStr << 4 | 0x08, 0x1E, // Summary + 0x78, 0x1E, // Summary 0x41, 0x6C, 0x6C, 0x6F, 0x77, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6D, 0x65, 0x20, 0x6F, 0x66, 0x20, 0x66, 0x61, 0x69, 0x6C, 0x65, 0x64, 0x20, 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x2E, - pckTypeStr << 4 | 0x08, 0x99, 0x02, // Description + 0x78, 0x99, 0x02, // Description 0x44, 0x65, 0x66, 0x69, 0x6E, 0x65, 0x73, 0x20, 0x77, 0x68, 0x65, 0x74, 0x68, 0x65, 0x72, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6D, 0x65, 0x20, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x20, 0x69, 0x73, 0x20, 0x65, 0x6E, 0x61, 0x62, 0x6C, 0x65, 0x64, 0x2E, 0x20, 0x52, 0x65, 0x73, 0x75, 0x6D, 0x65, 0x20, 0x63, 0x61, 0x6E, 0x20, 0x67, 0x72, @@ -3772,36 +3772,36 @@ static const unsigned char helpDataPack[] = // sck-block option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeBool << 4 | 0x0A, // Internal - pckTypeStr << 4 | 0x08, 0x07, // Section + 0x2A, // Internal + 0x78, 0x07, // Section 0x67, 0x65, 0x6E, 0x65, 0x72, 0x61, 0x6C, - pckTypeStr << 4 | 0x08, 0x17, // Summary + 0x78, 0x17, // Summary 0x53, 0x6F, 0x63, 0x6B, 0x65, 0x74, 0x20, 0x62, 0x6C, 0x6F, 0x63, 0x6B, 0x69, 0x6E, 0x67, 0x20, 0x65, 0x6E, 0x61, 0x62, 0x6C, 0x65, 0x2E, - pckTypeStr << 4 | 0x08, 0x26, // Description + 0x78, 0x26, // Description 0x45, 0x6E, 0x61, 0x62, 0x6C, 0x65, 0x20, 0x62, 0x6C, 0x6F, 0x63, 0x6B, 0x69, 0x6E, 0x67, 0x20, 0x6F, 0x6E, 0x20, 0x73, 0x6F, 0x63, 0x6B, 0x65, 0x74, 0x20, 0x63, 0x6F, 0x6E, 0x6E, 0x65, 0x63, 0x74, 0x69, 0x6F, 0x6E, 0x73, 0x2E, // sck-keep-alive option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x07, // Section + 0x7B, 0x07, // Section 0x67, 0x65, 0x6E, 0x65, 0x72, 0x61, 0x6C, - pckTypeStr << 4 | 0x08, 0x12, // Summary + 0x78, 0x12, // Summary 0x4B, 0x65, 0x65, 0x70, 0x2D, 0x61, 0x6C, 0x69, 0x76, 0x65, 0x20, 0x65, 0x6E, 0x61, 0x62, 0x6C, 0x65, 0x2E, - pckTypeStr << 4 | 0x08, 0x32, // Description + 0x78, 0x32, // Description 0x45, 0x6E, 0x61, 0x62, 0x6C, 0x65, 0x73, 0x20, 0x6B, 0x65, 0x65, 0x70, 0x2D, 0x61, 0x6C, 0x69, 0x76, 0x65, 0x20, 0x6D, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x20, 0x6F, 0x6E, 0x20, 0x73, 0x6F, 0x63, 0x6B, 0x65, 0x74, 0x20, 0x63, 0x6F, 0x6E, 0x6E, 0x65, 0x63, 0x74, 0x69, 0x6F, 0x6E, 0x73, 0x2E, // set option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeArray << 4 | 0x07, // Command overrides begin + 0x17, // Command overrides begin - pckTypeObj << 4 | 0x04, // Command expire override begin - pckTypeStr << 4 | 0x09, 0x15, // Summary + 0x54, // Command expire override begin + 0x79, 0x15, // Summary 0x42, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x20, 0x73, 0x65, 0x74, 0x20, 0x74, 0x6F, 0x20, 0x65, 0x78, 0x70, 0x69, 0x72, 0x65, 0x2E, - pckTypeStr << 4 | 0x08, 0xE7, 0x05, // Description + 0x78, 0xE7, 0x05, // Description 0x54, 0x68, 0x65, 0x20, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x64, 0x20, 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x20, 0x73, 0x65, 0x74, 0x20, 0x28, 0x69, 0x2E, 0x65, 0x2E, 0x20, 0x74, 0x68, 0x65, 0x20, 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x20, 0x6C, 0x61, 0x62, 0x65, 0x6C, 0x20, 0x70, 0x72, 0x6F, 0x76, 0x69, 0x64, @@ -3846,11 +3846,11 @@ static const unsigned char helpDataPack[] = 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x6F, 0x66, 0x20, 0x61, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x73, 0x2E, 0x00, // Command expire override end - pckTypeObj << 4 | 0x01, // Command info override begin - pckTypeStr << 4 | 0x09, 0x15, // Summary + 0x51, // Command info override begin + 0x79, 0x15, // Summary 0x42, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x20, 0x73, 0x65, 0x74, 0x20, 0x74, 0x6F, 0x20, 0x64, 0x65, 0x74, 0x61, 0x69, 0x6C, 0x2E, - pckTypeStr << 4 | 0x08, 0x92, 0x02, // Description + 0x78, 0x92, 0x02, // Description 0x44, 0x65, 0x74, 0x61, 0x69, 0x6C, 0x73, 0x20, 0x69, 0x6E, 0x63, 0x6C, 0x75, 0x64, 0x65, 0x20, 0x61, 0x20, 0x6C, 0x69, 0x73, 0x74, 0x20, 0x6F, 0x66, 0x20, 0x64, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x73, 0x20, 0x28, 0x77, 0x69, 0x74, 0x68, 0x20, 0x4F, 0x49, 0x44, 0x73, 0x29, 0x20, 0x69, 0x6E, 0x20, 0x74, 0x68, 0x65, @@ -3869,11 +3869,11 @@ static const unsigned char helpDataPack[] = 0x69, 0x65, 0x64, 0x2E, 0x00, // Command info override end - pckTypeObj << 4 | 0x05, // Command restore override begin - pckTypeStr << 4 | 0x09, 0x16, // Summary + 0x55, // Command restore override begin + 0x79, 0x16, // Summary 0x42, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x20, 0x73, 0x65, 0x74, 0x20, 0x74, 0x6F, 0x20, 0x72, 0x65, 0x73, 0x74, 0x6F, 0x72, 0x65, 0x2E, - pckTypeStr << 4 | 0x08, 0x7A, // Description + 0x78, 0x7A, // Description 0x54, 0x68, 0x65, 0x20, 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x20, 0x73, 0x65, 0x74, 0x20, 0x74, 0x6F, 0x20, 0x62, 0x65, 0x20, 0x72, 0x65, 0x73, 0x74, 0x6F, 0x72, 0x65, 0x64, 0x2E, 0x20, 0x6C, 0x61, 0x74, 0x65, 0x73, 0x74, 0x20, 0x77, 0x69, 0x6C, 0x6C, 0x20, 0x72, 0x65, 0x73, 0x74, 0x6F, 0x72, 0x65, 0x20, 0x74, 0x68, 0x65, @@ -3883,12 +3883,12 @@ static const unsigned char helpDataPack[] = 0x75, 0x70, 0x20, 0x74, 0x6F, 0x20, 0x72, 0x65, 0x73, 0x74, 0x6F, 0x72, 0x65, 0x2E, 0x00, // Command restore override end - pckTypeObj << 4 | 0x05, // Command verify override begin - pckTypeBool << 4 | 0x08, // Internal - pckTypeStr << 4 | 0x08, 0x15, // Summary + 0x55, // Command verify override begin + 0x28, // Internal + 0x78, 0x15, // Summary 0x42, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x20, 0x73, 0x65, 0x74, 0x20, 0x74, 0x6F, 0x20, 0x76, 0x65, 0x72, 0x69, 0x66, 0x79, 0x2E, - pckTypeStr << 4 | 0x08, 0x4F, // Description + 0x78, 0x4F, // Description 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x20, 0x61, 0x6C, 0x6C, 0x20, 0x64, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x20, 0x61, 0x6E, 0x64, 0x20, 0x61, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x20, 0x66, 0x69, 0x6C, 0x65, 0x73, 0x20, 0x61, 0x73, 0x73, 0x6F, 0x63, 0x69, 0x61, 0x74, 0x65, 0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, @@ -3900,14 +3900,14 @@ static const unsigned char helpDataPack[] = // sort option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeArray << 4 | 0x05, // Command overrides begin + 0x15, // Command overrides begin - pckTypeObj << 4 | 0x09, 0x01, // Command repo-ls override begin - pckTypeStr << 4 | 0x09, 0x2B, // Summary + 0x59, 0x01, // Command repo-ls override begin + 0x79, 0x2B, // Summary 0x53, 0x6F, 0x72, 0x74, 0x20, 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x20, 0x61, 0x73, 0x63, 0x65, 0x6E, 0x64, 0x69, 0x6E, 0x67, 0x2C, 0x20, 0x64, 0x65, 0x73, 0x63, 0x65, 0x6E, 0x64, 0x69, 0x6E, 0x67, 0x2C, 0x20, 0x6F, 0x72, 0x20, 0x6E, 0x6F, 0x6E, 0x65, 0x2E, - pckTypeStr << 4 | 0x08, 0x6F, // Description + 0x78, 0x6F, // Description 0x54, 0x68, 0x65, 0x20, 0x66, 0x6F, 0x6C, 0x6C, 0x6F, 0x77, 0x69, 0x6E, 0x67, 0x20, 0x73, 0x6F, 0x72, 0x74, 0x20, 0x74, 0x79, 0x70, 0x65, 0x73, 0x20, 0x61, 0x72, 0x65, 0x20, 0x73, 0x75, 0x70, 0x70, 0x6F, 0x72, 0x74, 0x65, 0x64, 0x3A, 0x0A, 0x0A, @@ -3923,12 +3923,12 @@ static const unsigned char helpDataPack[] = // spool-path option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x09, 0x07, // Section + 0x79, 0x07, // Section 0x67, 0x65, 0x6E, 0x65, 0x72, 0x61, 0x6C, - pckTypeStr << 4 | 0x08, 0x24, // Summary + 0x78, 0x24, // Summary 0x50, 0x61, 0x74, 0x68, 0x20, 0x77, 0x68, 0x65, 0x72, 0x65, 0x20, 0x74, 0x72, 0x61, 0x6E, 0x73, 0x69, 0x65, 0x6E, 0x74, 0x20, 0x64, 0x61, 0x74, 0x61, 0x20, 0x69, 0x73, 0x20, 0x73, 0x74, 0x6F, 0x72, 0x65, 0x64, 0x2E, - pckTypeStr << 4 | 0x08, 0xA7, 0x08, // Description + 0x78, 0xA7, 0x08, // Description 0x54, 0x68, 0x69, 0x73, 0x20, 0x70, 0x61, 0x74, 0x68, 0x20, 0x69, 0x73, 0x20, 0x75, 0x73, 0x65, 0x64, 0x20, 0x74, 0x6F, 0x20, 0x73, 0x74, 0x6F, 0x72, 0x65, 0x20, 0x64, 0x61, 0x74, 0x61, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x74, 0x68, 0x65, 0x20, 0x61, 0x73, 0x79, 0x6E, 0x63, 0x68, 0x72, 0x6F, 0x6E, 0x6F, 0x75, 0x73, 0x20, 0x61, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, @@ -3987,21 +3987,21 @@ static const unsigned char helpDataPack[] = 0x73, 0x74, 0x65, 0x6D, 0x20, 0x73, 0x75, 0x63, 0x68, 0x20, 0x61, 0x73, 0x20, 0x4E, 0x46, 0x53, 0x20, 0x6F, 0x72, 0x20, 0x43, 0x49, 0x46, 0x53, 0x2E, - pckTypeArray << 4 | 0x01, // Command overrides begin + 0x11, // Command overrides begin - pckTypeObj << 4 | 0x0C, 0x01, // Command restore override begin - pckTypeBool << 4 | 0x08, // Internal + 0x5C, 0x01, // Command restore override begin + 0x28, // Internal 0x00, // Command restore override end 0x00, // Command overrides end // stanza option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x09, 0x07, // Section + 0x79, 0x07, // Section 0x67, 0x65, 0x6E, 0x65, 0x72, 0x61, 0x6C, - pckTypeStr << 4 | 0x08, 0x13, // Summary + 0x78, 0x13, // Summary 0x44, 0x65, 0x66, 0x69, 0x6E, 0x65, 0x73, 0x20, 0x74, 0x68, 0x65, 0x20, 0x73, 0x74, 0x61, 0x6E, 0x7A, 0x61, 0x2E, - pckTypeStr << 4 | 0x08, 0xBA, 0x05, // Description + 0x78, 0xBA, 0x05, // Description 0x41, 0x20, 0x73, 0x74, 0x61, 0x6E, 0x7A, 0x61, 0x20, 0x69, 0x73, 0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 0x6F, 0x6E, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x61, 0x20, 0x50, 0x6F, 0x73, 0x74, 0x67, 0x72, 0x65, 0x53, 0x51, 0x4C, 0x20, 0x64, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x20, 0x63, 0x6C, 0x75, 0x73, @@ -4041,13 +4041,13 @@ static const unsigned char helpDataPack[] = // start-fast option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x06, // Section + 0x7B, 0x06, // Section 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, - pckTypeStr << 4 | 0x08, 0x2B, // Summary + 0x78, 0x2B, // Summary 0x46, 0x6F, 0x72, 0x63, 0x65, 0x20, 0x61, 0x20, 0x63, 0x68, 0x65, 0x63, 0x6B, 0x70, 0x6F, 0x69, 0x6E, 0x74, 0x20, 0x74, 0x6F, 0x20, 0x73, 0x74, 0x61, 0x72, 0x74, 0x20, 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x20, 0x71, 0x75, 0x69, 0x63, 0x6B, 0x6C, 0x79, 0x2E, - pckTypeStr << 4 | 0x08, 0xE1, 0x01, // Description + 0x78, 0xE1, 0x01, // Description 0x46, 0x6F, 0x72, 0x63, 0x65, 0x73, 0x20, 0x61, 0x20, 0x63, 0x68, 0x65, 0x63, 0x6B, 0x70, 0x6F, 0x69, 0x6E, 0x74, 0x20, 0x28, 0x62, 0x79, 0x20, 0x70, 0x61, 0x73, 0x73, 0x69, 0x6E, 0x67, 0x20, 0x79, 0x20, 0x74, 0x6F, 0x20, 0x74, 0x68, 0x65, 0x20, 0x66, 0x61, 0x73, 0x74, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6D, 0x65, 0x74, 0x65, 0x72, 0x20, 0x6F, 0x66, 0x20, 0x70, @@ -4063,12 +4063,12 @@ static const unsigned char helpDataPack[] = // stop-auto option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x06, // Section + 0x7B, 0x06, // Section 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, - pckTypeStr << 4 | 0x08, 0x27, // Summary + 0x78, 0x27, // Summary 0x53, 0x74, 0x6F, 0x70, 0x20, 0x70, 0x72, 0x69, 0x6F, 0x72, 0x20, 0x66, 0x61, 0x69, 0x6C, 0x65, 0x64, 0x20, 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x20, 0x6F, 0x6E, 0x20, 0x6E, 0x65, 0x77, 0x20, 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x2E, - pckTypeStr << 4 | 0x08, 0xB7, 0x05, // Description + 0x78, 0xB7, 0x05, // Description 0x54, 0x68, 0x69, 0x73, 0x20, 0x77, 0x69, 0x6C, 0x6C, 0x20, 0x6F, 0x6E, 0x6C, 0x79, 0x20, 0x62, 0x65, 0x20, 0x64, 0x6F, 0x6E, 0x65, 0x20, 0x69, 0x66, 0x20, 0x61, 0x6E, 0x20, 0x65, 0x78, 0x63, 0x6C, 0x75, 0x73, 0x69, 0x76, 0x65, 0x20, 0x61, 0x64, 0x76, 0x69, 0x73, 0x6F, 0x72, 0x79, 0x20, 0x6C, 0x6F, 0x63, 0x6B, 0x20, 0x63, 0x61, 0x6E, 0x20, 0x62, 0x65, 0x20, @@ -4108,13 +4108,13 @@ static const unsigned char helpDataPack[] = // tablespace-map option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x07, // Section + 0x7B, 0x07, // Section 0x72, 0x65, 0x73, 0x74, 0x6F, 0x72, 0x65, - pckTypeStr << 4 | 0x08, 0x32, // Summary + 0x78, 0x32, // Summary 0x52, 0x65, 0x73, 0x74, 0x6F, 0x72, 0x65, 0x20, 0x61, 0x20, 0x74, 0x61, 0x62, 0x6C, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x20, 0x69, 0x6E, 0x74, 0x6F, 0x20, 0x74, 0x68, 0x65, 0x20, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x64, 0x20, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6F, 0x72, 0x79, 0x2E, - pckTypeStr << 4 | 0x08, 0x87, 0x04, // Description + 0x78, 0x87, 0x04, // Description 0x4D, 0x6F, 0x76, 0x65, 0x73, 0x20, 0x61, 0x20, 0x74, 0x61, 0x62, 0x6C, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x20, 0x74, 0x6F, 0x20, 0x61, 0x20, 0x6E, 0x65, 0x77, 0x20, 0x6C, 0x6F, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x64, 0x75, 0x72, 0x69, 0x6E, 0x67, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x73, 0x74, 0x6F, 0x72, 0x65, 0x2E, 0x20, 0x54, 0x68, 0x69, @@ -4144,13 +4144,13 @@ static const unsigned char helpDataPack[] = // tablespace-map-all option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x07, // Section + 0x7B, 0x07, // Section 0x72, 0x65, 0x73, 0x74, 0x6F, 0x72, 0x65, - pckTypeStr << 4 | 0x08, 0x35, // Summary + 0x78, 0x35, // Summary 0x52, 0x65, 0x73, 0x74, 0x6F, 0x72, 0x65, 0x20, 0x61, 0x6C, 0x6C, 0x20, 0x74, 0x61, 0x62, 0x6C, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x20, 0x69, 0x6E, 0x74, 0x6F, 0x20, 0x74, 0x68, 0x65, 0x20, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x64, 0x20, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6F, 0x72, 0x79, 0x2E, - pckTypeStr << 4 | 0x08, 0xDA, 0x03, // Description + 0x78, 0xDA, 0x03, // Description 0x42, 0x79, 0x20, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6C, 0x74, 0x20, 0x74, 0x61, 0x62, 0x6C, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x20, 0x61, 0x72, 0x65, 0x20, 0x72, 0x65, 0x73, 0x74, 0x6F, 0x72, 0x65, 0x64, 0x20, 0x69, 0x6E, 0x74, 0x6F, 0x20, 0x74, 0x68, 0x65, 0x69, 0x72, 0x20, 0x6F, 0x72, 0x69, 0x67, 0x69, 0x6E, 0x61, 0x6C, 0x20, 0x6C, 0x6F, 0x63, 0x61, @@ -4179,12 +4179,12 @@ static const unsigned char helpDataPack[] = // target option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeArray << 4 | 0x07, // Command overrides begin + 0x17, // Command overrides begin - pckTypeObj << 4 | 0x0C, 0x01, // Command restore override begin - pckTypeStr << 4 | 0x09, 0x10, // Summary + 0x5C, 0x01, // Command restore override begin + 0x79, 0x10, // Summary 0x52, 0x65, 0x63, 0x6F, 0x76, 0x65, 0x72, 0x79, 0x20, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x2E, - pckTypeStr << 4 | 0x08, 0x3E, // Description + 0x78, 0x3E, // Description 0x44, 0x65, 0x66, 0x69, 0x6E, 0x65, 0x73, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x63, 0x6F, 0x76, 0x65, 0x72, 0x79, 0x20, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x20, 0x77, 0x68, 0x65, 0x6E, 0x20, 0x2D, 0x2D, 0x74, 0x79, 0x70, 0x65, 0x20, 0x69, 0x73, 0x20, 0x6E, 0x61, 0x6D, 0x65, 0x2C, 0x20, 0x78, 0x69, 0x64, 0x2C, 0x20, @@ -4195,14 +4195,14 @@ static const unsigned char helpDataPack[] = // target-action option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeArray << 4 | 0x05, // Command overrides begin + 0x15, // Command overrides begin - pckTypeObj << 4 | 0x0C, 0x01, // Command restore override begin - pckTypeStr << 4 | 0x09, 0x2F, // Summary + 0x5C, 0x01, // Command restore override begin + 0x79, 0x2F, // Summary 0x41, 0x63, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x74, 0x6F, 0x20, 0x74, 0x61, 0x6B, 0x65, 0x20, 0x77, 0x68, 0x65, 0x6E, 0x20, 0x72, 0x65, 0x63, 0x6F, 0x76, 0x65, 0x72, 0x79, 0x20, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x20, 0x69, 0x73, 0x20, 0x72, 0x65, 0x61, 0x63, 0x68, 0x65, 0x64, 0x2E, - pckTypeStr << 4 | 0x08, 0xD3, 0x03, // Description + 0x78, 0xD3, 0x03, // Description 0x54, 0x68, 0x69, 0x73, 0x20, 0x6F, 0x70, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x69, 0x73, 0x20, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x20, 0x77, 0x68, 0x65, 0x6E, 0x20, 0x68, 0x6F, 0x74, 0x5F, 0x73, 0x74, 0x61, 0x6E, 0x64, 0x62, 0x79, 0x3D, 0x6F, 0x6E, 0x20, 0x69, 0x73, 0x20, 0x63, 0x6F, 0x6E, 0x66, 0x69, 0x67, @@ -4238,14 +4238,14 @@ static const unsigned char helpDataPack[] = // target-exclusive option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeArray << 4 | 0x05, // Command overrides begin + 0x15, // Command overrides begin - pckTypeObj << 4 | 0x0C, 0x01, // Command restore override begin - pckTypeStr << 4 | 0x09, 0x30, // Summary + 0x5C, 0x01, // Command restore override begin + 0x79, 0x30, // Summary 0x53, 0x74, 0x6F, 0x70, 0x20, 0x6A, 0x75, 0x73, 0x74, 0x20, 0x62, 0x65, 0x66, 0x6F, 0x72, 0x65, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x63, 0x6F, 0x76, 0x65, 0x72, 0x79, 0x20, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x20, 0x69, 0x73, 0x20, 0x72, 0x65, 0x61, 0x63, 0x68, 0x65, 0x64, 0x2E, - pckTypeStr << 4 | 0x08, 0xD0, 0x02, // Description + 0x78, 0xD0, 0x02, // Description 0x44, 0x65, 0x66, 0x69, 0x6E, 0x65, 0x73, 0x20, 0x77, 0x68, 0x65, 0x74, 0x68, 0x65, 0x72, 0x20, 0x72, 0x65, 0x63, 0x6F, 0x76, 0x65, 0x72, 0x79, 0x20, 0x74, 0x6F, 0x20, 0x74, 0x68, 0x65, 0x20, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x20, 0x77, 0x6F, 0x75, 0x6C, 0x64, 0x20, 0x62, 0x65, 0x20, 0x65, 0x78, 0x63, 0x6C, 0x75, 0x73, @@ -4271,13 +4271,13 @@ static const unsigned char helpDataPack[] = // target-timeline option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeArray << 4 | 0x05, // Command overrides begin + 0x15, // Command overrides begin - pckTypeObj << 4 | 0x0C, 0x01, // Command restore override begin - pckTypeStr << 4 | 0x09, 0x19, // Summary + 0x5C, 0x01, // Command restore override begin + 0x79, 0x19, // Summary 0x52, 0x65, 0x63, 0x6F, 0x76, 0x65, 0x72, 0x20, 0x61, 0x6C, 0x6F, 0x6E, 0x67, 0x20, 0x61, 0x20, 0x74, 0x69, 0x6D, 0x65, 0x6C, 0x69, 0x6E, 0x65, 0x2E, - pckTypeStr << 4 | 0x08, 0x49, // Description + 0x78, 0x49, // Description 0x53, 0x65, 0x65, 0x20, 0x72, 0x65, 0x63, 0x6F, 0x76, 0x65, 0x72, 0x79, 0x5F, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x5F, 0x74, 0x69, 0x6D, 0x65, 0x6C, 0x69, 0x6E, 0x65, 0x20, 0x69, 0x6E, 0x20, 0x74, 0x68, 0x65, 0x20, 0x50, 0x6F, 0x73, 0x74, 0x67, 0x72, 0x65, 0x53, 0x51, 0x4C, 0x20, 0x64, 0x6F, 0x63, 0x73, 0x20, 0x66, 0x6F, @@ -4289,11 +4289,11 @@ static const unsigned char helpDataPack[] = // tcp-keep-alive-count option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x09, 0x07, // Section + 0x79, 0x07, // Section 0x67, 0x65, 0x6E, 0x65, 0x72, 0x61, 0x6C, - pckTypeStr << 4 | 0x08, 0x11, // Summary + 0x78, 0x11, // Summary 0x4B, 0x65, 0x65, 0x70, 0x2D, 0x61, 0x6C, 0x69, 0x76, 0x65, 0x20, 0x63, 0x6F, 0x75, 0x6E, 0x74, 0x2E, - pckTypeStr << 4 | 0x08, 0xBB, 0x01, // Description + 0x78, 0xBB, 0x01, // Description 0x53, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x73, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6E, 0x75, 0x6D, 0x62, 0x65, 0x72, 0x20, 0x6F, 0x66, 0x20, 0x54, 0x43, 0x50, 0x20, 0x6B, 0x65, 0x65, 0x70, 0x2D, 0x61, 0x6C, 0x69, 0x76, 0x65, 0x20, 0x6D, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x20, 0x74, 0x68, 0x61, 0x74, 0x20, 0x63, 0x61, 0x6E, 0x20, 0x62, 0x65, 0x20, @@ -4307,12 +4307,12 @@ static const unsigned char helpDataPack[] = // tcp-keep-alive-idle option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x07, // Section + 0x7B, 0x07, // Section 0x67, 0x65, 0x6E, 0x65, 0x72, 0x61, 0x6C, - pckTypeStr << 4 | 0x08, 0x15, // Summary + 0x78, 0x15, // Summary 0x4B, 0x65, 0x65, 0x70, 0x2D, 0x61, 0x6C, 0x69, 0x76, 0x65, 0x20, 0x69, 0x64, 0x6C, 0x65, 0x20, 0x74, 0x69, 0x6D, 0x65, 0x2E, - pckTypeStr << 4 | 0x08, 0xDB, 0x01, // Description + 0x78, 0xDB, 0x01, // Description 0x53, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x73, 0x20, 0x74, 0x68, 0x65, 0x20, 0x61, 0x6D, 0x6F, 0x75, 0x6E, 0x74, 0x20, 0x6F, 0x66, 0x20, 0x74, 0x69, 0x6D, 0x65, 0x20, 0x28, 0x69, 0x6E, 0x20, 0x73, 0x65, 0x63, 0x6F, 0x6E, 0x64, 0x73, 0x29, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x6E, 0x6F, 0x20, 0x6E, 0x65, 0x74, 0x77, 0x6F, 0x72, 0x6B, 0x20, 0x61, 0x63, @@ -4327,12 +4327,12 @@ static const unsigned char helpDataPack[] = // tcp-keep-alive-interval option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeStr << 4 | 0x0B, 0x07, // Section + 0x7B, 0x07, // Section 0x67, 0x65, 0x6E, 0x65, 0x72, 0x61, 0x6C, - pckTypeStr << 4 | 0x08, 0x19, // Summary + 0x78, 0x19, // Summary 0x4B, 0x65, 0x65, 0x70, 0x2D, 0x61, 0x6C, 0x69, 0x76, 0x65, 0x20, 0x69, 0x6E, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6C, 0x20, 0x74, 0x69, 0x6D, 0x65, 0x2E, - pckTypeStr << 4 | 0x08, 0xD9, 0x01, // Description + 0x78, 0xD9, 0x01, // Description 0x53, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x73, 0x20, 0x74, 0x68, 0x65, 0x20, 0x61, 0x6D, 0x6F, 0x75, 0x6E, 0x74, 0x20, 0x6F, 0x66, 0x20, 0x74, 0x69, 0x6D, 0x65, 0x20, 0x28, 0x69, 0x6E, 0x20, 0x73, 0x65, 0x63, 0x6F, 0x6E, 0x64, 0x73, 0x29, 0x20, 0x61, 0x66, 0x74, 0x65, 0x72, 0x20, 0x77, 0x68, 0x69, 0x63, 0x68, 0x20, 0x61, 0x20, 0x54, 0x43, 0x50, 0x20, @@ -4348,12 +4348,12 @@ static const unsigned char helpDataPack[] = // type option // ------------------------------------------------------------------------------------------------------------------------- - pckTypeArray << 4 | 0x07, // Command overrides begin + 0x17, // Command overrides begin - pckTypeObj << 4 | 0x02, // Command backup override begin - pckTypeStr << 4 | 0x09, 0x0C, // Summary + 0x52, // Command backup override begin + 0x79, 0x0C, // Summary 0x42, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x20, 0x74, 0x79, 0x70, 0x65, 0x2E, - pckTypeStr << 4 | 0x08, 0x98, 0x02, // Description + 0x78, 0x98, 0x02, // Description 0x54, 0x68, 0x65, 0x20, 0x66, 0x6F, 0x6C, 0x6C, 0x6F, 0x77, 0x69, 0x6E, 0x67, 0x20, 0x62, 0x61, 0x63, 0x6B, 0x75, 0x70, 0x20, 0x74, 0x79, 0x70, 0x65, 0x73, 0x20, 0x61, 0x72, 0x65, 0x20, 0x73, 0x75, 0x70, 0x70, 0x6F, 0x72, 0x74, 0x65, 0x64, 0x3A, 0x0A, 0x0A, @@ -4373,10 +4373,10 @@ static const unsigned char helpDataPack[] = 0x63, 0x6B, 0x75, 0x70, 0x2E, 0x00, // Command backup override end - pckTypeObj << 4 | 0x09, 0x01, // Command restore override begin - pckTypeStr << 4 | 0x09, 0x0E, // Summary + 0x59, 0x01, // Command restore override begin + 0x79, 0x0E, // Summary 0x52, 0x65, 0x63, 0x6F, 0x76, 0x65, 0x72, 0x79, 0x20, 0x74, 0x79, 0x70, 0x65, 0x2E, - pckTypeStr << 4 | 0x08, 0x84, 0x06, // Description + 0x78, 0x84, 0x06, // Description 0x54, 0x68, 0x65, 0x20, 0x66, 0x6F, 0x6C, 0x6C, 0x6F, 0x77, 0x69, 0x6E, 0x67, 0x20, 0x72, 0x65, 0x63, 0x6F, 0x76, 0x65, 0x72, 0x79, 0x20, 0x74, 0x79, 0x70, 0x65, 0x73, 0x20, 0x61, 0x72, 0x65, 0x20, 0x73, 0x75, 0x70, 0x70, 0x6F, 0x72, 0x74, 0x65, 0x64, 0x3A, 0x0A, 0x0A, diff --git a/src/common/type/pack.c b/src/common/type/pack.c index c2f5a9448..0650bb6f1 100644 --- a/src/common/type/pack.c +++ b/src/common/type/pack.c @@ -1,13 +1,14 @@ /*********************************************************************************************************************************** Pack Type -Each pack field begins with a one byte tag. The four high order bits of the tag contain the field type (PackType). The four lower -order bits vary by type. +Each pack field begins with a one byte tag. The four high order bits of the tag contain the field type (PackTypeMap). To allow more +types than four bits will allow, the type bits can be set to 0xF and the rest of the type (- 0xF) will be stored by a base-128 +encoded integer immediately following the tag. The four lower order bits vary by type. -When the "more ID delta" indicator is set then the tag will be followed by a base-128 encoded integer with the higher order ID delta -bits. The ID delta represents the delta from the ID of the previous field. When the "more value indicator" then the tag (and the ID -delta, if any) will be followed by a base-128 encoded integer with the high order value bits, i.e. the bits that were not stored -directly in the tag. +When the "more ID delta" indicator is set then the tag (and type, if any) will be followed by a base-128 encoded integer with the +higher order ID delta bits. The ID delta represents the delta from the ID of the previous field. When the "more value indicator" +then the tag (and the type and ID delta, if any) will be followed by a base-128 encoded integer with the high order value bits, i.e. +the bits that were not stored directly in the tag. For integer types the value is the integer being stored but for string and binary types the value is 1 if the size is greater than 0 and 0 if the size is 0. When the size is greater than 0 the tag is immediately followed by (or after the delta ID if "more ID delta" @@ -17,7 +18,7 @@ prevents storing an additional byte when the string/binary length is zero. The following are definitions for the pack tag field and examples of how it is interpretted. -Integer types (packTypeData[type].valueMultiBit) when an unsigned value is <= 1 or a signed value is >= -1 and <= 0: +Integer types (packTypeMapData[type].valueMultiBit) when an unsigned value is <= 1 or a signed value is >= -1 and <= 0: 3 - more value indicator bit set to 0 2 - value low order bit 1 - more ID delta indicator bit @@ -37,7 +38,7 @@ Integer types (packTypeData[type].valueMultiBit) when an unsigned value is <= 1 add back the "ID delta low order bit" to give a binary representation of 1 0 0 1 = 9. Add back the 1 which is never recorded and the ID gap is 10. -Integer types (packTypeData[type].valueMultiBit) when an unsigned value is > 1 or a signed value is < -1 or > 0: +Integer types (packTypeMapData[type].valueMultiBit) when an unsigned value is > 1 or a signed value is < -1 or > 0: 3 - more value indicator bit set to 1 2 - more ID delta indicator bit 0-1 - ID delta low order bits @@ -54,7 +55,7 @@ Integer types (packTypeData[type].valueMultiBit) when an unsigned value is > 1 o the bit representation would be 1 0 1 0 which is ten (10) so the gap between the IDs is 11. 1f = signed, zigzag representation of -16 (the actual value) -String, binary types, and boolean (packTypeData[type].valueSingleBit): +String, binary types, and boolean (packTypeMapData[type].valueSingleBit): 3 - value bit 2 - more ID delta indicator bit 0-1 - ID delta low order bits @@ -109,101 +110,120 @@ Constants #define PACK_UINT64_SIZE_MAX 10 /*********************************************************************************************************************************** -Type data +Map PackType types to the types that will be written into the pack. This hides the details of the type IDs from the user and allows +the IDs used in the pack to differ from the IDs the user sees. ***********************************************************************************************************************************/ -typedef struct PackTypeData +typedef enum +{ + pckTypeMapUnknown = 0, // Used internally when the type is not known + pckTypeMapArray = 1, // Maps to pckTypeArray + pckTypeMapBool = 2, // Maps to pckTypeBool + pckTypeMapI32 = 3, // Maps to pckTypeI32 + pckTypeMapI64 = 4, // Maps to pckTypeI64 + pckTypeMapObj = 5, // Maps to pckTypeObj + pckTypeMapPtr = 6, // Maps to pckTypePtr + pckTypeMapStr = 7, // Maps to pckTypeStr + pckTypeMapU32 = 8, // Maps to pckTypeU32 + pckTypeMapU64 = 9, // Maps to pckTypeU64 + + // The empty positions before 15 can be used for new types that will be encoded entirely in the tag + + pckTypeMapTime = 15, // Maps to pckTypeTime + pckTypeMapBin = 16, // Maps to pckTypeBin +} PackTypeMap; + +typedef struct PackTypeMapData { PackType type; // Data type bool valueSingleBit; // Can the value be stored in a single bit (e.g. bool) bool valueMultiBit; // Can the value require multiple bits (e.g. integer) bool size; // Does the type require a size (e.g. string) - const String *const name; // Type name used in error messages -} PackTypeData; +} PackTypeMapData; -static const PackTypeData packTypeData[] = +static const PackTypeMapData packTypeMapData[] = { - { - .type = pckTypeUnknown, - .name = STRDEF("unknown"), - }, + // Unknown type map data should not be used + {0}, + + // Formats that can be encoded entirely in the tag { .type = pckTypeArray, - .name = STRDEF("array"), - }, - { - .type = pckTypeBin, - .valueSingleBit = true, - .size = true, - .name = STRDEF("bin"), }, { .type = pckTypeBool, .valueSingleBit = true, - .name = STRDEF("bool"), }, { .type = pckTypeI32, .valueMultiBit = true, - .name = STRDEF("i32"), }, { .type = pckTypeI64, .valueMultiBit = true, - .name = STRDEF("i64"), }, { .type = pckTypeObj, - .name = STRDEF("obj"), }, { .type = pckTypePtr, .valueMultiBit = true, - .name = STRDEF("ptr"), }, { .type = pckTypeStr, .valueSingleBit = true, .size = true, - .name = STRDEF("str"), - }, - { - .type = pckTypeTime, - .valueMultiBit = true, - .name = STRDEF("time"), }, { .type = pckTypeU32, .valueMultiBit = true, - .name = STRDEF("u32"), }, { .type = pckTypeU64, .valueMultiBit = true, - .name = STRDEF("u64"), + }, + + // Placeholders for unused types that can be encoded entirely in the tag + {0}, + {0}, + {0}, + {0}, + {0}, + + // Formats that require an extra byte to encode + { + .type = pckTypeTime, + .valueMultiBit = true, + }, + { + .type = pckTypeBin, + .valueSingleBit = true, + .size = true, }, }; +#define PACK_TYPE_MAP_SIZE (sizeof(packTypeMapData) / sizeof(PackTypeMapData)) + /*********************************************************************************************************************************** Object types ***********************************************************************************************************************************/ typedef struct PackTagStack { - PackType type; - unsigned int idLast; - unsigned int nullTotal; + PackTypeMap typeMap; // Tag type map + unsigned int idLast; // Last id in the container + unsigned int nullTotal; // Total nulls since last tag written } PackTagStack; struct PackRead { MemContext *memContext; // Mem context IoRead *read; // Read pack from - Buffer *buffer; // Buffer to contain read data + Buffer *buffer; // Buffer containing read data const uint8_t *bufferPtr; // Pointer to buffer size_t bufferPos; // Position in the buffer size_t bufferUsed; // Amount of data in the buffer unsigned int tagNextId; // Next tag id - PackType tagNextType; // Next tag type + PackTypeMap tagNextTypeMap; // Next tag type map uint64_t tagNextValue; // Next tag value List *tagStack; // Stack of object/array tags @@ -239,7 +259,7 @@ pckReadNewInternal(void) .tagStack = lstNewP(sizeof(PackTagStack)), }; - this->tagStackTop = lstAdd(this->tagStack, &(PackTagStack){.type = pckTypeObj}); + this->tagStackTop = lstAdd(this->tagStack, &(PackTagStack){.typeMap = pckTypeMapObj}); } MEM_CONTEXT_NEW_END(); @@ -394,10 +414,15 @@ pckReadTagNext(PackRead *this) else { // Read field type (e.g. int64, string) - this->tagNextType = tag >> 4; + this->tagNextTypeMap = tag >> 4; + + if (this->tagNextTypeMap == 0xF) + this->tagNextTypeMap = (unsigned int)pckReadU64Internal(this) + 0xF; + + CHECK(this->tagNextTypeMap < PACK_TYPE_MAP_SIZE && packTypeMapData[this->tagNextTypeMap].type != 0); // If the value can contain multiple bits (e.g. integer) - if (packTypeData[this->tagNextType].valueMultiBit) + if (packTypeMapData[this->tagNextTypeMap].valueMultiBit) { // If the value is stored following the tag (value > 1 bit) if (tag & 0x8) @@ -427,7 +452,7 @@ pckReadTagNext(PackRead *this) } } // Else the value is a single bit (e.g. boolean) - else if (packTypeData[this->tagNextType].valueSingleBit) + else if (packTypeMapData[this->tagNextTypeMap].valueSingleBit) { // Read low order bits of the field ID delta this->tagNextId = tag & 0x3; @@ -469,18 +494,18 @@ Read field tag Some tags and data may be skipped based on the value of the id parameter. ***********************************************************************************************************************************/ static uint64_t -pckReadTag(PackRead *this, unsigned int *id, PackType type, bool peek) +pckReadTag(PackRead *this, unsigned int *id, PackTypeMap typeMap, bool peek) { FUNCTION_TEST_BEGIN(); FUNCTION_TEST_PARAM(PACK_READ, this); FUNCTION_TEST_PARAM_P(UINT, id); - FUNCTION_TEST_PARAM(ENUM, type); + FUNCTION_TEST_PARAM(ENUM, typeMap); FUNCTION_TEST_PARAM(BOOL, peek); // Look at the next tag without advancing the field id FUNCTION_TEST_END(); ASSERT(this != NULL); ASSERT(id != NULL); - ASSERT((peek && type == pckTypeUnknown) || (!peek && type != pckTypeUnknown)); + ASSERT((peek && typeMap == pckTypeMapUnknown) || (!peek && typeMap != pckTypeMapUnknown)); // Increment the id by one if no id was specified if (*id == 0) @@ -506,14 +531,15 @@ pckReadTag(PackRead *this, unsigned int *id, PackType type, bool peek) // Else the id exists else if (*id == this->tagNextId) { - // When not peeking the next tag (just to see what it is) then error if the type is not as specified + // When not peeking the next tag (just to see what it is) then error if the type map is not as specified if (!peek) { - if (this->tagNextType != type) + if (this->tagNextTypeMap != typeMap) { THROW_FMT( FormatError, "field %u is type '%s' but expected '%s'", this->tagNextId, - strZ(packTypeData[this->tagNextType].name), strZ(packTypeData[type].name)); + strZ(strIdToStr(packTypeMapData[this->tagNextTypeMap].type)), + strZ(strIdToStr(packTypeMapData[typeMap].type))); } this->tagStackTop->idLast = this->tagNextId; @@ -524,7 +550,7 @@ pckReadTag(PackRead *this, unsigned int *id, PackType type, bool peek) } // Read data for the field being skipped if this is not the field requested - if (packTypeData[this->tagNextType].size && this->tagNextValue != 0) + if (packTypeMapData[this->tagNextTypeMap].size && this->tagNextValue != 0) { size_t sizeExpected = (size_t)pckReadU64Internal(this); @@ -588,7 +614,7 @@ pckReadNullInternal(PackRead *this, unsigned int *id) ASSERT(id != NULL); // Read tag at specified id - pckReadTag(this, id, pckTypeUnknown, true); + pckReadTag(this, id, pckTypeMapUnknown, true); // If the field is NULL then set idLast (to avoid rechecking the same id on the next call) and return true if (*id < this->tagNextId) @@ -624,7 +650,7 @@ pckReadType(PackRead *this) ASSERT(this != NULL); - FUNCTION_TEST_RETURN(this->tagNextType); + FUNCTION_TEST_RETURN(packTypeMapData[this->tagNextTypeMap].type); } /**********************************************************************************************************************************/ @@ -639,10 +665,10 @@ pckReadArrayBegin(PackRead *this, PackIdParam param) ASSERT(this != NULL); // Read array begin - pckReadTag(this, ¶m.id, pckTypeArray, false); + pckReadTag(this, ¶m.id, pckTypeMapArray, false); // Add array to the tag stack so IDs can be tracked separately from the parent container - this->tagStackTop = lstAdd(this->tagStack, &(PackTagStack){.type = pckTypeArray}); + this->tagStackTop = lstAdd(this->tagStack, &(PackTagStack){.typeMap = pckTypeMapArray}); FUNCTION_TEST_RETURN_VOID(); } @@ -656,12 +682,12 @@ pckReadArrayEnd(PackRead *this) ASSERT(this != NULL); - if (lstSize(this->tagStack) == 1 || this->tagStackTop->type != pckTypeArray) + if (lstSize(this->tagStack) == 1 || this->tagStackTop->typeMap != pckTypeMapArray) THROW(FormatError, "not in array"); // Make sure we are at the end of the array unsigned int id = UINT_MAX - 1; - pckReadTag(this, &id, pckTypeUnknown, true); + pckReadTag(this, &id, pckTypeMapUnknown, true); // Pop array off the stack lstRemoveLast(this->tagStack); @@ -690,7 +716,7 @@ pckReadBin(PackRead *this, PckReadBinParam param) Buffer *result = NULL; // If buffer size > 0 - if (pckReadTag(this, ¶m.id, pckTypeBin, false)) + if (pckReadTag(this, ¶m.id, pckTypeMapBin, false)) { // Get the buffer size result = bufNew((size_t)pckReadU64Internal(this)); @@ -725,7 +751,7 @@ pckReadBool(PackRead *this, PckReadBoolParam param) if (pckReadNullInternal(this, ¶m.id)) FUNCTION_TEST_RETURN(param.defaultValue); - FUNCTION_TEST_RETURN(pckReadTag(this, ¶m.id, pckTypeBool, false)); + FUNCTION_TEST_RETURN(pckReadTag(this, ¶m.id, pckTypeMapBool, false)); } /**********************************************************************************************************************************/ @@ -743,7 +769,7 @@ pckReadI32(PackRead *this, PckReadI32Param param) if (pckReadNullInternal(this, ¶m.id)) FUNCTION_TEST_RETURN(param.defaultValue); - FUNCTION_TEST_RETURN(cvtInt32FromZigZag((uint32_t)pckReadTag(this, ¶m.id, pckTypeI32, false))); + FUNCTION_TEST_RETURN(cvtInt32FromZigZag((uint32_t)pckReadTag(this, ¶m.id, pckTypeMapI32, false))); } /**********************************************************************************************************************************/ @@ -761,7 +787,7 @@ pckReadI64(PackRead *this, PckReadI64Param param) if (pckReadNullInternal(this, ¶m.id)) FUNCTION_TEST_RETURN(param.defaultValue); - FUNCTION_TEST_RETURN(cvtInt64FromZigZag(pckReadTag(this, ¶m.id, pckTypeI64, false))); + FUNCTION_TEST_RETURN(cvtInt64FromZigZag(pckReadTag(this, ¶m.id, pckTypeMapI64, false))); } /**********************************************************************************************************************************/ @@ -776,10 +802,10 @@ pckReadObjBegin(PackRead *this, PackIdParam param) ASSERT(this != NULL); // Read object begin - pckReadTag(this, ¶m.id, pckTypeObj, false); + pckReadTag(this, ¶m.id, pckTypeMapObj, false); // Add object to the tag stack so IDs can be tracked separately from the parent container - this->tagStackTop = lstAdd(this->tagStack, &(PackTagStack){.type = pckTypeObj}); + this->tagStackTop = lstAdd(this->tagStack, &(PackTagStack){.typeMap = pckTypeMapObj}); FUNCTION_TEST_RETURN_VOID(); } @@ -793,12 +819,12 @@ pckReadObjEnd(PackRead *this) ASSERT(this != NULL); - if (lstSize(this->tagStack) == 1 || ((PackTagStack *)lstGetLast(this->tagStack))->type != pckTypeObj) + if (lstSize(this->tagStack) == 1 || ((PackTagStack *)lstGetLast(this->tagStack))->typeMap != pckTypeMapObj) THROW(FormatError, "not in object"); // Make sure we are at the end of the object unsigned id = UINT_MAX - 1; - pckReadTag(this, &id, pckTypeUnknown, true); + pckReadTag(this, &id, pckTypeMapUnknown, true); // Pop object off the stack lstRemoveLast(this->tagStack); @@ -824,7 +850,7 @@ pckReadPtr(PackRead *this, PckReadPtrParam param) if (pckReadNullInternal(this, ¶m.id)) FUNCTION_TEST_RETURN(NULL); - FUNCTION_TEST_RETURN((void *)(uintptr_t)pckReadTag(this, ¶m.id, pckTypePtr, false)); + FUNCTION_TEST_RETURN((void *)(uintptr_t)pckReadTag(this, ¶m.id, pckTypeMapPtr, false)); } /**********************************************************************************************************************************/ @@ -845,7 +871,7 @@ pckReadStr(PackRead *this, PckReadStrParam param) String *result = NULL; // If string size > 0 - if (pckReadTag(this, ¶m.id, pckTypeStr, false)) + if (pckReadTag(this, ¶m.id, pckTypeMapStr, false)) { // Read the string size size_t sizeExpected = (size_t)pckReadU64Internal(this); @@ -882,7 +908,7 @@ pckReadTime(PackRead *this, PckReadTimeParam param) if (pckReadNullInternal(this, ¶m.id)) FUNCTION_TEST_RETURN(param.defaultValue); - FUNCTION_TEST_RETURN((time_t)cvtInt64FromZigZag(pckReadTag(this, ¶m.id, pckTypeTime, false))); + FUNCTION_TEST_RETURN((time_t)cvtInt64FromZigZag(pckReadTag(this, ¶m.id, pckTypeMapTime, false))); } /**********************************************************************************************************************************/ @@ -900,7 +926,7 @@ pckReadU32(PackRead *this, PckReadU32Param param) if (pckReadNullInternal(this, ¶m.id)) FUNCTION_TEST_RETURN(param.defaultValue); - FUNCTION_TEST_RETURN((uint32_t)pckReadTag(this, ¶m.id, pckTypeU32, false)); + FUNCTION_TEST_RETURN((uint32_t)pckReadTag(this, ¶m.id, pckTypeMapU32, false)); } /**********************************************************************************************************************************/ @@ -918,7 +944,7 @@ pckReadU64(PackRead *this, PckReadU64Param param) if (pckReadNullInternal(this, ¶m.id)) FUNCTION_TEST_RETURN(param.defaultValue); - FUNCTION_TEST_RETURN(pckReadTag(this, ¶m.id, pckTypeU64, false)); + FUNCTION_TEST_RETURN(pckReadTag(this, ¶m.id, pckTypeMapU64, false)); } /**********************************************************************************************************************************/ @@ -936,7 +962,7 @@ pckReadEnd(PackRead *this) { // Make sure we are at the end of the container unsigned int id = UINT_MAX - 1; - pckReadTag(this, &id, pckTypeUnknown, true); + pckReadTag(this, &id, pckTypeMapUnknown, true); // Remove from stack lstRemoveLast(this->tagStack); @@ -953,7 +979,7 @@ pckReadToLog(const PackRead *this) { return strNewFmt( "{depth: %u, idLast: %u, tagNextId: %u, tagNextType: %u, tagNextValue %" PRIu64 "}", lstSize(this->tagStack), - this->tagStackTop->idLast, this->tagNextId, this->tagNextType, this->tagNextValue); + this->tagStackTop->idLast, this->tagNextId, this->tagNextTypeMap, this->tagNextValue); } /**********************************************************************************************************************************/ @@ -975,7 +1001,7 @@ pckWriteNewInternal(void) .tagStack = lstNewP(sizeof(PackTagStack)), }; - this->tagStackTop = lstAdd(this->tagStack, &(PackTagStack){.type = pckTypeObj}); + this->tagStackTop = lstAdd(this->tagStack, &(PackTagStack){.typeMap = pckTypeMapObj}); } MEM_CONTEXT_NEW_END(); @@ -1112,11 +1138,11 @@ pckWriteU64Internal(PackWrite *this, uint64_t value) Write field tag ***********************************************************************************************************************************/ static void -pckWriteTag(PackWrite *this, PackType type, unsigned int id, uint64_t value) +pckWriteTag(PackWrite *this, PackTypeMap typeMap, unsigned int id, uint64_t value) { FUNCTION_TEST_BEGIN(); FUNCTION_TEST_PARAM(PACK_WRITE, this); - FUNCTION_TEST_PARAM(ENUM, type); + FUNCTION_TEST_PARAM(ENUM, typeMap); FUNCTION_TEST_PARAM(UINT, id); FUNCTION_TEST_PARAM(UINT64, value); FUNCTION_TEST_END(); @@ -1138,11 +1164,11 @@ pckWriteTag(PackWrite *this, PackType type, unsigned int id, uint64_t value) // Calculate field ID delta unsigned int tagId = id - this->tagStackTop->idLast - 1; - // Write field type (e.g. int64, string) - uint64_t tag = type << 4; + // Write field type map (e.g. int64, string) + uint64_t tag = typeMap >= 0xF ? 0xF0 : typeMap << 4; // If the value can contain multiple bits (e.g. integer) - if (packTypeData[type].valueMultiBit) + if (packTypeMapData[typeMap].valueMultiBit) { // If the value is stored in the tag (value == 1 bit) if (value < 2) @@ -1175,7 +1201,7 @@ pckWriteTag(PackWrite *this, PackType type, unsigned int id, uint64_t value) } } // Else the value is a single bit (e.g. boolean) - else if (packTypeData[type].valueSingleBit) + else if (packTypeMapData[typeMap].valueSingleBit) { // Write value tag |= (value & 0x1) << 3; @@ -1207,6 +1233,10 @@ pckWriteTag(PackWrite *this, PackType type, unsigned int id, uint64_t value) uint8_t tagByte = (uint8_t)tag; pckWriteBuffer(this, BUF(&tagByte, 1)); + // Write remaining type map + if (typeMap >= 0xF) + pckWriteU64Internal(this, typeMap - 0xF); + // Write low order bits of the field ID delta if (tagId > 0) pckWriteU64Internal(this, tagId); @@ -1271,10 +1301,10 @@ pckWriteArrayBegin(PackWrite *this, PackIdParam param) ASSERT(this != NULL); // Write the array tag - pckWriteTag(this, pckTypeArray, param.id, 0); + pckWriteTag(this, pckTypeMapArray, param.id, 0); // Add array to the tag stack so IDs can be tracked separately from the parent container - this->tagStackTop = lstAdd(this->tagStack, &(PackTagStack){.type = pckTypeArray}); + this->tagStackTop = lstAdd(this->tagStack, &(PackTagStack){.typeMap = pckTypeMapArray}); FUNCTION_TEST_RETURN(this); } @@ -1288,7 +1318,7 @@ pckWriteArrayEnd(PackWrite *this) ASSERT(this != NULL); ASSERT(lstSize(this->tagStack) != 1); - ASSERT(((PackTagStack *)lstGetLast(this->tagStack))->type == pckTypeArray); + ASSERT(((PackTagStack *)lstGetLast(this->tagStack))->typeMap == pckTypeMapArray); // Write end of array tag pckWriteU64Internal(this, 0); @@ -1317,7 +1347,7 @@ pckWriteBin(PackWrite *this, const Buffer *value, PckWriteBinParam param) ASSERT(value != NULL); // Write buffer size if > 0 - pckWriteTag(this, pckTypeBin, param.id, !bufEmpty(value)); + pckWriteTag(this, pckTypeMapBin, param.id, !bufEmpty(value)); // Write buffer data if size > 0 if (!bufEmpty(value)) @@ -1345,7 +1375,7 @@ pckWriteBool(PackWrite *this, bool value, PckWriteBoolParam param) ASSERT(this != NULL); if (!pckWriteDefaultNull(this, param.defaultWrite, value == param.defaultValue)) - pckWriteTag(this, pckTypeBool, param.id, value); + pckWriteTag(this, pckTypeMapBool, param.id, value); FUNCTION_TEST_RETURN(this); } @@ -1365,7 +1395,7 @@ pckWriteI32(PackWrite *this, int32_t value, PckWriteI32Param param) ASSERT(this != NULL); if (!pckWriteDefaultNull(this, param.defaultWrite, value == param.defaultValue)) - pckWriteTag(this, pckTypeI32, param.id, cvtInt32ToZigZag(value)); + pckWriteTag(this, pckTypeMapI32, param.id, cvtInt32ToZigZag(value)); FUNCTION_TEST_RETURN(this); } @@ -1385,7 +1415,7 @@ pckWriteI64(PackWrite *this, int64_t value, PckWriteI64Param param) ASSERT(this != NULL); if (!pckWriteDefaultNull(this, param.defaultWrite, value == param.defaultValue)) - pckWriteTag(this, pckTypeI64, param.id, cvtInt64ToZigZag(value)); + pckWriteTag(this, pckTypeMapI64, param.id, cvtInt64ToZigZag(value)); FUNCTION_TEST_RETURN(this); } @@ -1402,10 +1432,10 @@ pckWriteObjBegin(PackWrite *this, PackIdParam param) ASSERT(this != NULL); // Write the object tag - pckWriteTag(this, pckTypeObj, param.id, 0); + pckWriteTag(this, pckTypeMapObj, param.id, 0); // Add object to the tag stack so IDs can be tracked separately from the parent container - this->tagStackTop = lstAdd(this->tagStack, &(PackTagStack){.type = pckTypeObj}); + this->tagStackTop = lstAdd(this->tagStack, &(PackTagStack){.typeMap = pckTypeMapObj}); FUNCTION_TEST_RETURN(this); } @@ -1419,7 +1449,7 @@ pckWriteObjEnd(PackWrite *this) ASSERT(this != NULL); ASSERT(lstSize(this->tagStack) != 1); - ASSERT(((PackTagStack *)lstGetLast(this->tagStack))->type == pckTypeObj); + ASSERT(((PackTagStack *)lstGetLast(this->tagStack))->typeMap == pckTypeMapObj); // Write end of object tag pckWriteU64Internal(this, 0); @@ -1445,7 +1475,7 @@ pckWritePtr(PackWrite *this, const void *value, PckWritePtrParam param) ASSERT(this != NULL); if (!pckWriteDefaultNull(this, param.defaultWrite, value == NULL)) - pckWriteTag(this, pckTypePtr, param.id, (uintptr_t)value); + pckWriteTag(this, pckTypeMapPtr, param.id, (uintptr_t)value); FUNCTION_TEST_RETURN(this); } @@ -1467,7 +1497,7 @@ pckWriteStr(PackWrite *this, const String *value, PckWriteStrParam param) ASSERT(value != NULL); // Write string size if > 0 - pckWriteTag(this, pckTypeStr, param.id, strSize(value) > 0); + pckWriteTag(this, pckTypeMapStr, param.id, strSize(value) > 0); // Write string data if size > 0 if (strSize(value) > 0) @@ -1495,7 +1525,7 @@ pckWriteTime(PackWrite *this, time_t value, PckWriteTimeParam param) ASSERT(this != NULL); if (!pckWriteDefaultNull(this, param.defaultWrite, value == param.defaultValue)) - pckWriteTag(this, pckTypeTime, param.id, cvtInt64ToZigZag(value)); + pckWriteTag(this, pckTypeMapTime, param.id, cvtInt64ToZigZag(value)); FUNCTION_TEST_RETURN(this); } @@ -1515,7 +1545,7 @@ pckWriteU32(PackWrite *this, uint32_t value, PckWriteU32Param param) ASSERT(this != NULL); if (!pckWriteDefaultNull(this, param.defaultWrite, value == param.defaultValue)) - pckWriteTag(this, pckTypeU32, param.id, value); + pckWriteTag(this, pckTypeMapU32, param.id, value); FUNCTION_TEST_RETURN(this); } @@ -1535,7 +1565,7 @@ pckWriteU64(PackWrite *this, uint64_t value, PckWriteU64Param param) ASSERT(this != NULL); if (!pckWriteDefaultNull(this, param.defaultWrite, value == param.defaultValue)) - pckWriteTag(this, pckTypeU64, param.id, value); + pckWriteTag(this, pckTypeMapU64, param.id, value); FUNCTION_TEST_RETURN(this); } @@ -1573,16 +1603,3 @@ pckWriteToLog(const PackWrite *this) { return strNewFmt("{depth: %u, idLast: %u}", lstSize(this->tagStack), this->tagStackTop->idLast); } - -/**********************************************************************************************************************************/ -const String * -pckTypeToStr(PackType type) -{ - FUNCTION_TEST_BEGIN(); - FUNCTION_TEST_PARAM(ENUM, type); - FUNCTION_TEST_END(); - - ASSERT(type < sizeof(packTypeData) / sizeof(PackTypeData)); - - FUNCTION_TEST_RETURN(packTypeData[type].name); -} diff --git a/src/common/type/pack.h b/src/common/type/pack.h index f0d11f66c..b48259341 100644 --- a/src/common/type/pack.h +++ b/src/common/type/pack.h @@ -98,25 +98,24 @@ typedef struct PackWrite PackWrite; #include "common/io/read.h" #include "common/io/write.h" #include "common/type/object.h" -#include "common/type/string.h" +#include "common/type/stringId.h" /*********************************************************************************************************************************** Pack data type ***********************************************************************************************************************************/ typedef enum { - pckTypeUnknown = 0, - pckTypeArray, - pckTypeBin, - pckTypeBool, - pckTypeI32, - pckTypeI64, - pckTypeObj, - pckTypePtr, - pckTypeStr, - pckTypeTime, - pckTypeU32, - pckTypeU64, + pckTypeArray = STRID5("array", 0x190ca410), + pckTypeBin = STRID5("bin", 0x39220), + pckTypeBool = STRID5("bool", 0x63de20), + pckTypeI32 = STRID6("i32", 0x1e7c91), + pckTypeI64 = STRID6("i64", 0x208891), + pckTypeObj = STRID5("obj", 0x284f0), + pckTypePtr = STRID5("ptr", 0x4a900), + pckTypeStr = STRID5("str", 0x4a930), + pckTypeTime = STRID5("time", 0x2b5340), + pckTypeU32 = STRID6("u32", 0x1e7d51), + pckTypeU64 = STRID6("u64", 0x208951), } PackType; /*********************************************************************************************************************************** @@ -478,11 +477,6 @@ pckWriteFree(PackWrite *const this) objFree(this); } -/*********************************************************************************************************************************** -Helper Functions -***********************************************************************************************************************************/ -const String *pckTypeToStr(PackType type); - /*********************************************************************************************************************************** Macros for function logging ***********************************************************************************************************************************/ diff --git a/test/src/common/harnessPack.c b/test/src/common/harnessPack.c index cd7bd2b5f..49ce09a45 100644 --- a/test/src/common/harnessPack.c +++ b/test/src/common/harnessPack.c @@ -39,13 +39,10 @@ String *hrnPackToStr(PackRead *read) PackType type = pckReadType(read); unsigned int id = pckReadId(read); - strCatFmt(result, "%u:%s:", id, strZ(pckTypeToStr(type))); + strCatFmt(result, "%u:%s:", id, strZ(strIdToStr(type))); switch (type) { - case pckTypeUnknown: - THROW_FMT(AssertError, "invalid type %s", strZ(pckTypeToStr(type))); - case pckTypeArray: pckReadArrayBeginP(read, .id = id); strCatFmt(result, "[%s]", strZ(hrnPackToStr(read))); diff --git a/test/src/module/common/typePackTest.c b/test/src/module/common/typePackTest.c index 1af649fa0..5a80a1874 100644 --- a/test/src/module/common/typePackTest.c +++ b/test/src/module/common/typePackTest.c @@ -17,6 +17,12 @@ testRun(void) // ***************************************************************************************************************************** if (testBegin("PackWrite and PackRead")) { + TEST_TITLE("type size"); + + TEST_RESULT_UINT(sizeof(PackType), 4, "PackType"); + TEST_RESULT_UINT(sizeof(PackTypeMapData), 8, "PackTypeMapData"); + + // ------------------------------------------------------------------------------------------------------------------------- TEST_TITLE("write pack"); Buffer *pack = bufNew(0); @@ -140,46 +146,46 @@ testRun(void) TEST_RESULT_STR_Z( bufHex(pack), - "b8e803" // 1, u64, 750 - "b8fd9fad8f07" // 2, u64, 1911246845 - "bc01ffffffffffffffffff01" // 7, u64, 0xFFFFFFFFFFFFFFFF - "b601" // 10, u64, 1 - "b84d" // 11, u64, 77 - "a87f" // 12, u32, 127 - "54" // 13, i64, -1 - "44" // 14, i32, -1 - "38" // 15, bool, true - "3401" // 20, bool, false - "67" // 28, obj begin - "38" // 1, bool - "30" // 2, bool + "98e803" // 1, u64, 750 + "98fd9fad8f07" // 2, u64, 1911246845 + "9c01ffffffffffffffffff01" // 7, u64, 0xFFFFFFFFFFFFFFFF + "9601" // 10, u64, 1 + "984d" // 11, u64, 77 + "887f" // 12, u32, 127 + "44" // 13, i64, -1 + "34" // 14, i32, -1 + "28" // 15, bool, true + "2401" // 20, bool, false + "57" // 28, obj begin + "28" // 1, bool + "20" // 2, bool "00" // obj end "1801" // 37, array begin - "b0" // 1, u64, 0 - "b4" // 2, u64, 1 - "b802" // 3, u64, 2 - "b803" // 4, u64, 3 + "90" // 1, u64, 0 + "94" // 2, u64, 1 + "9802" // 3, u64, 2 + "9803" // 4, u64, 3 "00" // array end - "880673616d706c65" // 38, str, sample - "8816656e6f756768746f696e637265617365627566666572" // 39, str, enoughtoincreasebuffer - "80" // 40, str, zero length - "8805736d616c6c" // 41, str, small - "80" // 42, str, zero length - "82" // 45, str, zero length - "a1" // 47, u32, 0 + "780673616d706c65" // 38, str, sample + "7816656e6f756768746f696e637265617365627566666572" // 39, str, enoughtoincreasebuffer + "70" // 40, str, zero length + "7805736d616c6c" // 41, str, small + "70" // 42, str, zero length + "72" // 45, str, zero length + "81" // 47, u32, 0 "10" // 48, array begin - "60" // 1, obj begin - "48d608" // 1, i32, 555 - "49920c" // 3, i32, 777 - "5902" // 5, i64, 1 - "b5" // 7, u64, 1 + "50" // 1, obj begin + "38d608" // 1, i32, 555 + "39920c" // 3, i32, 777 + "4902" // 5, i64, 1 + "95" // 7, u64, 1 "00" // obj end - "890141" // 3, str, A - "9942" // 5, time, 33 - "988401" // 6, time, 66 + "790141" // 3, str, A + "f90042" // 5, time, 33 + "f8008401" // 6, time, 66 "00" // array end - "2806050403020100" // 49, bin, 0x050403020100 - "21" // 51, bin, zero length + "f80106050403020100" // 49, bin, 0x050403020100 + "f101" // 51, bin, zero length "00", // end "check pack hex");