Fix conversion warnings gbak (burp)

+ make some things constexpr

Author: mrotteveel

src/burp/burp.cpp

@@ -88,15 +88,14 @@ using namespace Firebird;
 using MsgFormat::SafeArg;
 using namespace Burp;
 
-const char* fopen_write_type = "w";
-const char* fopen_read_type	 = "r";
+inline constexpr const char* fopen_write_type = "w";
+inline constexpr const char* fopen_read_type = "r";
 
-const int open_mask = 0666;
-const char switch_char = '-';
+inline constexpr int open_mask = 0666;
+inline constexpr char switch_char = '-';
 
-
-const char* const output_suppress	= "SUPPRESS";
-const int MIN_VERBOSE_INTERVAL		= 100;
+inline constexpr const char* output_suppress = "SUPPRESS";
+inline constexpr int MIN_VERBOSE_INTERVAL = 100;
 
 enum gbak_action
 {
@@ -121,9 +120,9 @@ static void processFetchPass(const SCHAR*& password, int& itr, const int argc, F
 
 
 // fil.fil_length is FB_UINT64
-const ULONG KBYTE	= 1024;
-const ULONG MBYTE	= KBYTE * KBYTE;
-const ULONG GBYTE	= MBYTE * KBYTE;
+inline constexpr ULONG KBYTE = 1024;
+inline constexpr ULONG MBYTE = 1024 * KBYTE;
+inline constexpr ULONG GBYTE = 1024 * MBYTE;
 
 // Must be consistent with enum BurpGlobals::StatCounter
 struct StatFormat
@@ -132,8 +131,8 @@ struct StatFormat
 	const char* format;
 	char width;
 };
-static const char* STAT_CHARS = "TDRW";
-static const StatFormat STAT_FORMATS[] =
+static inline constexpr const char* STAT_CHARS = "TDRW";
+static inline constexpr StatFormat STAT_FORMATS[] =
 {
 	{"time",	"%4lu.%03u ",  9},
 	{"delta",	"%2lu.%03u ",  7},
@@ -2607,7 +2606,7 @@ static ULONG get_size(const SCHAR* string, burp_fil* file)
  *	restoring to multiple files
  *
  **********************************************/
-	const FB_UINT64 overflow = MAX_UINT64 / 10 - 1;
+	constexpr FB_UINT64 overflow = MAX_UINT64 / 10 - 1;
 	UCHAR c;
 	FB_UINT64 size = 0;
 	bool digit = false;
@@ -2749,7 +2748,7 @@ namespace // for local symbols
 		if (!matcher)
 			return NOT_SET;
 
-		return matcher->matches(name, strlen(name))? MATCH : NOT_MATCH;
+		return matcher->matches(name, fb_strlen(name)) ? MATCH : NOT_MATCH;
 	}
 }
 
@@ -2829,7 +2828,7 @@ void BurpGlobals::print_stats(USHORT number)
 
 	burp_output(false, " ");
 
-	const int time_mask = (1 << TIME_TOTAL) | (1 << TIME_DELTA);
+	constexpr int time_mask = (1 << TIME_TOTAL) | (1 << TIME_DELTA);
 	if (gbl_stat_flags & time_mask)
 	{
 		const SINT64 t0 = fb_utils::query_performance_counter();

src/burp/burp.h

@@ -67,16 +67,16 @@
 //#define COMPRESS_DEBUG 1
 #endif // WIRE_COMPRESS_SUPPORT
 
-const int GDS_NAME_LEN		= METADATA_IDENTIFIER_CHAR_LEN * 4 /* max bytes per char */ + 1;
-typedef TEXT			GDS_NAME[GDS_NAME_LEN];
+inline constexpr int GDS_NAME_LEN = METADATA_IDENTIFIER_CHAR_LEN * 4 /* max bytes per char */ + 1;
+typedef TEXT GDS_NAME[GDS_NAME_LEN];
 
 enum redirect_vals {
 	NOREDIRECT = 0,
 	REDIRECT = 1,
 	NOOUTPUT = 2
 };
 
-static const int burp_msg_fac = 12;
+static inline constexpr int burp_msg_fac = FB_IMPL_MSG_FACILITY_GBAK;
 
 // Record types in backup file
 
@@ -213,15 +213,15 @@ Version 12: FB6.0.
 			Schemas.
 */
 
-const int ATT_BACKUP_FORMAT		= 12;
+inline constexpr int ATT_BACKUP_FORMAT = 12;
 
 // max array dimension
 
-const int MAX_DIMENSION			= 16;
+inline constexpr int MAX_DIMENSION = 16;
 
-const int SERIES				= 1;
+inline constexpr int SERIES = 1;
 
-const USHORT MAX_UPDATE_DBKEY_RECURSION_DEPTH = 16;
+inline constexpr USHORT MAX_UPDATE_DBKEY_RECURSION_DEPTH = 16;
 
 
 enum att_type {
@@ -715,13 +715,13 @@ enum trig_t {
 // these types to go away when recognized by gpre as
 // <relation>.<field>.<type>  some time in the future
 
-const int TRIG_TYPE_PRE_STORE = 1;
-const int TRIG_TYPE_PRE_MODIFY = 3;
-const int TRIG_TYPE_POST_ERASE = 6;
+inline constexpr int TRIG_TYPE_PRE_STORE = 1;
+inline constexpr int TRIG_TYPE_PRE_MODIFY = 3;
+inline constexpr int TRIG_TYPE_POST_ERASE = 6;
 
 // default trigger name templates
 
-const int TRIGGER_SEQUENCE_DEFAULT	= 0;
+inline constexpr int TRIGGER_SEQUENCE_DEFAULT = 0;
 
 // common structure definitions
 
@@ -852,7 +852,7 @@ struct burp_meta_obj
 
 // CVC: Could use MAXPATHLEN, but what about restoring in a different system?
 // I need to review if we tolerate different lengths for different OS's here.
-const unsigned int MAX_FILE_NAME_SIZE		= 256;
+inline constexpr unsigned int MAX_FILE_NAME_SIZE = 256;
 
 #include "../burp/std_desc.h"
 
@@ -936,9 +936,9 @@ struct burp_act
 		act_t		act_action;
 };
 
-const size_t ACT_LEN = sizeof(burp_act);
+inline constexpr size_t ACT_LEN = sizeof(burp_act);
 
-const ULONG MAX_LENGTH = ~FB_CONST64(0);	// Keep in sync with burp_fil.fil_length
+inline constexpr ULONG MAX_LENGTH = ~FB_CONST64(0);	// Keep in sync with burp_fil.fil_length
 
 // This structure has been cloned from spit.cpp
 
@@ -958,12 +958,12 @@ struct hdr_split
 // NOTE: size of the hdr_split_tag and HDR_SPLIT_TAG must be the same and equal
 // to 18. Otherwise we will not be able to join the gbk files v5.x
 
-const size_t HDR_SPLIT_SIZE	= sizeof(hdr_split);
-static const char HDR_SPLIT_TAG5[]	= "InterBase/gsplit, ";
-static const char HDR_SPLIT_TAG6[]	= "InterBase/gbak,   ";
+inline constexpr size_t HDR_SPLIT_SIZE	= sizeof(hdr_split);
+static inline constexpr char HDR_SPLIT_TAG5[]	= "InterBase/gsplit, ";
+static inline constexpr char HDR_SPLIT_TAG6[]	= "InterBase/gbak,   ";
 // CVC: Don't convert to const char* or you will have to fix the sizeof()'s!!!
 #define HDR_SPLIT_TAG HDR_SPLIT_TAG6
-const FB_UINT64 MIN_SPLIT_SIZE	= FB_CONST64(2048);		// bytes
+inline constexpr FB_UINT64 MIN_SPLIT_SIZE	= FB_CONST64(2048);		// bytes
 
 
 // Global switches and data
@@ -1285,7 +1285,7 @@ class BurpGlobals : public Firebird::ThreadData, public GblPool
 void	BURP_exit_local(int code, BurpGlobals* tdgbl);
 
 // database is not on-line due to failure to activate one or more indices
-const int FINI_DB_NOT_ONLINE		= 2;
+inline constexpr int FINI_DB_NOT_ONLINE = 2;
 
 /* Burp will always write a backup in multiples of the following number
  * of bytes.  The initial value is the smallest which ensures that writes
@@ -1296,8 +1296,8 @@ const int FINI_DB_NOT_ONLINE		= 2;
  * bit masking.
  */
 
-const int BURP_BLOCK		= 512;
-inline static ULONG BURP_UP_TO_BLOCK(const ULONG size)
+inline constexpr int BURP_BLOCK = 512;
+static inline constexpr ULONG BURP_UP_TO_BLOCK(const ULONG size)
 {
 	return (((size) + BURP_BLOCK - 1) & ~(BURP_BLOCK - 1));
 }
@@ -1306,11 +1306,11 @@ inline static ULONG BURP_UP_TO_BLOCK(const ULONG size)
 // so that other files can see them for multivolume opens
 
 #ifdef WIN_NT
-static const ULONG MODE_READ	= GENERIC_READ;
-static const ULONG MODE_WRITE	= GENERIC_WRITE;
+static inline constexpr ULONG MODE_READ = GENERIC_READ;
+static inline constexpr ULONG MODE_WRITE = GENERIC_WRITE;
 #else
-static const ULONG MODE_READ	= O_RDONLY;
-static const ULONG MODE_WRITE	= O_WRONLY | O_CREAT;
+static inline constexpr ULONG MODE_READ = O_RDONLY;
+static inline constexpr ULONG MODE_WRITE = O_WRONLY | O_CREAT;
 #endif
 
 

src/burp/mvol.cpp

@@ -72,14 +72,14 @@ using MsgFormat::SafeArg;
 using Firebird::FbLocalStatus;
 using namespace Burp;
 
-const int open_mask	= 0666;
+inline constexpr int open_mask	= 0666;
 
 #ifdef WIN_NT
-const char* TERM_INPUT	= "CONIN$";
-const char* TERM_OUTPUT	= "CONOUT$";
+inline constexpr const char* TERM_INPUT		= "CONIN$";
+inline constexpr const char* TERM_OUTPUT	= "CONOUT$";
 #else
-const char* TERM_INPUT	= "/dev/tty";
-const char* TERM_OUTPUT	= "/dev/tty";
+inline constexpr const char* TERM_INPUT		= "/dev/tty";
+inline constexpr const char* TERM_OUTPUT	= "/dev/tty";
 #endif
 
 static int	 mvol_read(int*, UCHAR**);
@@ -91,8 +91,8 @@ static FB_UINT64 mvol_fini_write(BurpGlobals*, int*, UCHAR**);
 static void	 mvol_init_write(BurpGlobals*, const char*, int*, UCHAR**);
 static void	 brio_fini(BurpGlobals*);
 
-static const int MAX_HEADER_SIZE		= 512;
-static const int ZC_BUFSIZE				= IO_BUFFER_SIZE;
+static inline constexpr int MAX_HEADER_SIZE	= 512;
+static inline constexpr int ZC_BUFSIZE		= IO_BUFFER_SIZE;
 
 static inline int get(BurpGlobals* tdgbl)
 {
@@ -101,7 +101,7 @@ static inline int get(BurpGlobals* tdgbl)
 	return (--tdgbl->mvol_io_cnt >= 0 ? *tdgbl->mvol_io_ptr++ : 255);
 }
 
-static inline void put(BurpGlobals* tdgbl, UCHAR c)
+static inline void put(BurpGlobals* tdgbl, UCHAR c) noexcept
 {
 	--tdgbl->mvol_io_cnt;
 	*tdgbl->mvol_io_ptr++ = c;
@@ -132,7 +132,7 @@ static void	 zip_write_block(BurpGlobals*, const UCHAR*, FB_SIZE_T, bool);
 static ULONG unzip_read_block(BurpGlobals*, UCHAR*, FB_SIZE_T);
 
 // Portion of data passed to crypt plugin
-const ULONG CRYPT_STEP = 256;
+inline constexpr ULONG CRYPT_STEP = 256;
 
 class DbInfo final : public Firebird::RefCntIface<Firebird::IDbCryptInfoImpl<DbInfo, Firebird::CheckStatusWrapper> >
 {
@@ -1706,11 +1706,11 @@ static void prompt_for_name(SCHAR* name, int length)
 //
 // Write an attribute starting with a null terminated string.
 //
-static void put_asciz( SCHAR attribute, const TEXT* str)
+static void put_asciz(SCHAR attribute, const TEXT* str)
 {
 	BurpGlobals* tdgbl = BurpGlobals::getSpecific();
 
-	USHORT l = strlen(str);
+	USHORT l = static_cast<USHORT>(strlen(str));
 	if (l > MAX_UCHAR)
 	{
 		BURP_print(false, 343, SafeArg() << int(attribute) << "put_asciz()" << USHORT(MAX_UCHAR));

src/burp/split/spit.h

@@ -25,20 +25,18 @@
  * Contributor(s): ______________________________________.
  */
 
-const char BLANK				= ' ';
-const int FILE_IS_FULL			= -9;
-//const int FILE_NM_ARR_LEN		= 20;
-//const char* GSPLIT_HDR_REC_NM	= "InterBase/Gsplit";
+inline constexpr char BLANK					= ' ';
+inline constexpr int FILE_IS_FULL			= -9;
 
-const int K_BYTES				= 1024;
-const int IO_BUFFER_SIZE		= (16 * K_BYTES);
-const int SVC_IO_BUFFER_SIZE	= (16 * (IO_BUFFER_SIZE));
-const int GBAK_IO_BUFFER_SIZE	= SVC_IO_BUFFER_SIZE;
+inline constexpr int K_BYTES				= 1024;
+inline constexpr int M_BYTES				= 1024 * K_BYTES;
+inline constexpr int G_BYTES				= 1024 * M_BYTES;
+inline constexpr int IO_BUFFER_SIZE			= 16 * K_BYTES;
+inline constexpr int SVC_IO_BUFFER_SIZE		= 16 * IO_BUFFER_SIZE;
+inline constexpr int GBAK_IO_BUFFER_SIZE	= SVC_IO_BUFFER_SIZE;
 
-const int M_BYTES				= (K_BYTES * K_BYTES);
-const int G_BYTES				= (K_BYTES * M_BYTES);
-const size_t MAX_FILE_NM_LEN	= 27;	// size of header_rec.fl_name
-const int MAX_NUM_OF_FILES		= 9999;
-const int MIN_FILE_SIZE			= M_BYTES;
-const char NEW_LINE				= '\n';
-const char TERMINAL				= '\0';
+inline constexpr size_t MAX_FILE_NM_LEN		= 27;	// size of header_rec.fl_name
+inline constexpr int MAX_NUM_OF_FILES		= 9999;
+inline constexpr int MIN_FILE_SIZE			= M_BYTES;
+inline constexpr char NEW_LINE				= '\n';
+inline constexpr char TERMINAL				= '\0';