Fix -Wswitch and -Wparentheses warnings in backup and restore

+ constexpr

Author: mrotteveel

src/burp/backup.epp

@@ -164,25 +164,25 @@ UCHAR debug_on = 0;		// able to turn this on in debug mode
 #endif
 
 
-const UCHAR blob_items[] =
+constexpr UCHAR blob_items[] =
 {
 	isc_info_blob_max_segment,
 	isc_info_blob_num_segments,
 	isc_info_blob_type,
 	isc_info_blob_total_length
 };
-const UCHAR blr_items[] =
+constexpr UCHAR blr_items[] =
 {
 	isc_info_blob_max_segment,
 	isc_info_blob_total_length
 };
-const UCHAR source_items[] =
+constexpr UCHAR source_items[] =
 {
 	isc_info_blob_max_segment,
 	isc_info_blob_total_length,
 	isc_info_blob_num_segments
 };
-const UCHAR db_info_items[] =
+constexpr UCHAR db_info_items[] =
 {
 	isc_info_db_sql_dialect,
 	isc_info_page_size,
@@ -194,12 +194,12 @@ const UCHAR db_info_items[] =
 	fb_info_replica_mode,
 	isc_info_end
 };
-const UCHAR limbo_tpb[] =
+constexpr UCHAR limbo_tpb[] =
 {
 	isc_tpb_version1,
 	isc_tpb_ignore_limbo
 };
-const UCHAR limbo_nau_tpb[] =
+constexpr UCHAR limbo_nau_tpb[] =
 {
 	isc_tpb_version1,
 	isc_tpb_ignore_limbo,
@@ -291,7 +291,7 @@ int BACKUP_backup(const TEXT* dbb_file, const TEXT* file_name)
 	// detect if MAKE_DBKEY is supported and decide kind of read relation query
 	if (tdgbl->gbl_sw_par_workers > 1)
 	{
-		const char* sql = "SELECT MAKE_DBKEY(0, 0) FROM RDB$DATABASE";
+		constexpr const char* sql = "SELECT MAKE_DBKEY(0, 0) FROM RDB$DATABASE";
 		IStatement* stmt = DB->prepare(fbStatus, gds_trans, 0, sql, 3, 0);
 		if (fbStatus->getState() & IStatus::RESULT_ERROR)
 		{
@@ -1945,7 +1945,7 @@ void put_relation( burp_rel* relation)
 
 	// sort the list of fields into three lists, depending on alignment
 	burp_fld* field;
-	for (field = fields; field = fields;)
+	for (field = fields; (field = fields);)
 	{
 		fields = field->fld_next;
 		USHORT l = field->fld_length;
@@ -1977,28 +1977,28 @@ void put_relation( burp_rel* relation)
 	// re-create (approximately) the original order of the fields.  This is
 	// not strictly required, but it certainly is polite.
 
-	while (field = unaligned)
+	while ((field = unaligned))
 	{
 		unaligned = field->fld_next;
 		field->fld_next = relation->rel_fields;
 		relation->rel_fields = field;
 	}
 
-	while (field = aligned)
+	while ((field = aligned))
 	{
 		aligned = field->fld_next;
 		field->fld_next = relation->rel_fields;
 		relation->rel_fields = field;
 	}
 
-	while (field = aligned4)
+	while ((field = aligned4))
 	{
 		aligned4 = field->fld_next;
 		field->fld_next = relation->rel_fields;
 		relation->rel_fields = field;
 	}
 
-	while (field = aligned8)
+	while ((field = aligned8))
 	{
 		aligned8 = field->fld_next;
 		field->fld_next = relation->rel_fields;
@@ -2628,12 +2628,12 @@ void write_database( const TEXT* dbb_file)
 			break;
 
 		case isc_info_no_reserve:
-			if (no_reserve = (USHORT) gds__vax_integer(d, length))
+			if ((no_reserve = (USHORT) gds__vax_integer(d, length)) != 0)
 				put_int32(att_no_reserve, no_reserve);
 			break;
 
 		case isc_info_set_page_buffers:
-			if (page_buffers = gds__vax_integer(d, length))
+			if ((page_buffers = gds__vax_integer(d, length)) != 0)
 				put_int32(att_page_buffers, page_buffers);
 			break;
 
@@ -2646,12 +2646,12 @@ void write_database( const TEXT* dbb_file)
 			break;
 
 		case isc_info_db_read_only:
-			if (db_read_only = (USHORT) gds__vax_integer(d, length))
+			if ((db_read_only = (USHORT) gds__vax_integer(d, length)) != 0)
 				put_int32(att_db_read_only, db_read_only);
 			break;
 
 		case fb_info_replica_mode:
-			if (replica_mode = (USHORT) gds__vax_integer(d, length))
+			if ((replica_mode = (USHORT) gds__vax_integer(d, length)) != 0)
 				put_int32(att_replica_mode, replica_mode);
 			break;
 
@@ -4335,7 +4335,7 @@ void write_sql_roles()
 				put_source_blob (att_role_description, att_role_description, X.RDB$DESCRIPTION);
 			}
 
-			const UCHAR ll = sizeof(X.RDB$SYSTEM_PRIVILEGES);
+			constexpr UCHAR ll = sizeof(X.RDB$SYSTEM_PRIVILEGES);
 			put(tdgbl, att_role_sys_priveleges);
 			put(tdgbl, ll);
 			put_block(tdgbl, (const UCHAR*) (X.RDB$SYSTEM_PRIVILEGES), ll);

src/burp/restore.epp

@@ -93,7 +93,7 @@ DATABASE DB = STATIC FILENAME "yachts.lnk";
 namespace // unnamed, private
 {
 
-const int DEFERRED_ACTIVE		= 3;	// RDB$INDEX_INACTIVE setting for Foreign Keys
+constexpr int DEFERRED_ACTIVE	= 3;	// RDB$INDEX_INACTIVE setting for Foreign Keys
 										// This setting is used temporarily while
 										// restoring a database. This was required
 										// in order to differentiate a partial
@@ -193,7 +193,7 @@ UCHAR	debug_on = 0;   // able to turn this on in the debugger
 #endif
 
 #ifdef sparc
-const SSHORT old_sparcs[] =
+constexpr SSHORT old_sparcs[] =
     {0, 0, 0, 2, 0, 0, 0, 0, 2, 4, 4, 4, 8, 8, 0, 0, 8, 8, 8};
 #endif
 
@@ -258,14 +258,14 @@ static inline void skip_scan(scan_attr_t* scan_next_attr)
 
 // User Privilege Flags
 
-const int USER_PRIV_USER			= 1;
-const int USER_PRIV_GRANTOR			= 2;
-const int USER_PRIV_PRIVILEGE		= 4;
-const int USER_PRIV_GRANT_OPTION	= 8;
-const int USER_PRIV_OBJECT_NAME		= 16;
-const int USER_PRIV_FIELD_NAME		= 32;
-const int USER_PRIV_USER_TYPE		= 64;
-const int USER_PRIV_OBJECT_TYPE		= 128;
+constexpr int USER_PRIV_USER			= 1;
+constexpr int USER_PRIV_GRANTOR			= 2;
+constexpr int USER_PRIV_PRIVILEGE		= 4;
+constexpr int USER_PRIV_GRANT_OPTION	= 8;
+constexpr int USER_PRIV_OBJECT_NAME		= 16;
+constexpr int USER_PRIV_FIELD_NAME		= 32;
+constexpr int USER_PRIV_USER_TYPE		= 64;
+constexpr int USER_PRIV_OBJECT_TYPE		= 128;
 
 static inline void collect_missing_privs(BurpGlobals* tdgbl, USHORT type, const QualifiedMetaString& name,
 	bool hasSecClass)
@@ -361,7 +361,7 @@ int RESTORE_restore (const TEXT* file_name, const TEXT* database_name)
 		// don't throw away the database just because an index
 		// could not be made
 		long error_code;
-		while (error_code = tdgbl->status_vector[1])
+		while ((error_code = tdgbl->status_vector[1]) != 0L)
 		{
 			switch (error_code)
 			{
@@ -1564,7 +1564,7 @@ bool get_acl(BurpGlobals* tdgbl, const TEXT* owner_nm, ISC_QUAD* blob_id, ISC_QU
  *
  **************************************/
 
-	static const UCHAR blr_items[] =
+	static constexpr UCHAR blr_items[] =
 	{
 		isc_info_blob_max_segment,
 		isc_info_blob_total_length,
@@ -3193,7 +3193,7 @@ static void commit_relation_data(BurpGlobals* tdgbl, burp_rel* relation)
 		tdgbl->flag_on_line = false;
 
 		ISC_STATUS error_code;
-		while (error_code = tdgbl->status_vector[1])
+		while ((error_code = tdgbl->status_vector[1]) != 0)
 		{
 			Firebird::IRequest* req_handle = 0;
 			QualifiedMetaString indexName;
@@ -3276,7 +3276,7 @@ void fix_exception(BurpGlobals* tdgbl, const QualifiedMetaString& name, scan_att
 
 		// Notice we use 1021 instead of 1023 because this is the maximum length
 		// for this field in v2.0 and v2.1 and they produce the corrupt backups.
-		const unsigned int FIELD_LIMIT = 1021;
+		constexpr unsigned int FIELD_LIMIT = 1021;
 
 		if (FIELD_LIMIT < l2 + 1) // not enough space
 		{
@@ -6305,7 +6305,7 @@ bool get_global_field(BurpGlobals* tdgbl)
 			if (X.RDB$FIELD_TYPE <= DTYPE_BLR_MAX)
 			{
 				SSHORT l = gds_cvt_blr_dtype[X.RDB$FIELD_TYPE];
-				if (l = type_lengths[l])
+				if ((l = type_lengths[l]) != 0)
 					X.RDB$FIELD_LENGTH = l;
 			}
 
@@ -6651,7 +6651,7 @@ bool get_global_field(BurpGlobals* tdgbl)
 			if (X.RDB$FIELD_TYPE <= DTYPE_BLR_MAX)
 			{
 				SSHORT l = gds_cvt_blr_dtype[X.RDB$FIELD_TYPE];
-				if (l = type_lengths[l])
+				if ((l = type_lengths[l]) != 0)
 					X.RDB$FIELD_LENGTH = l;
 			}
 
@@ -8933,13 +8933,13 @@ bool get_mapping(BurpGlobals* tdgbl)
 	else
 	{
 		int match = 0;
-		const unsigned MATCH_FROM = 0x01;
-		const unsigned MATCH_FROM_TYPE = 0x02;
-		const unsigned MATCH_USING = 0x04;
-		const unsigned MATCH_PLUGIN = 0x08;
-		const unsigned MATCH_TO_TYPE = 0x10;
-		const unsigned MATCH_TO = 0x20;
-		const unsigned MATCH_ALL = 0x3f;
+		constexpr unsigned MATCH_FROM = 0x01;
+		constexpr unsigned MATCH_FROM_TYPE = 0x02;
+		constexpr unsigned MATCH_USING = 0x04;
+		constexpr unsigned MATCH_PLUGIN = 0x08;
+		constexpr unsigned MATCH_TO_TYPE = 0x10;
+		constexpr unsigned MATCH_TO = 0x20;
+		constexpr unsigned MATCH_ALL = 0x3f;
 		Firebird::NoCaseString txt;
 
 		skip_init(&scan_next_attr);
@@ -8994,6 +8994,8 @@ bool get_mapping(BurpGlobals* tdgbl)
 						match |= MATCH_TO;
 					break;
 
+				default:
+					break;
 				}
 				break;
 
@@ -12174,7 +12176,7 @@ void fix_generator(BurpGlobals* tdgbl, const FixGenerator* g)
 	}
 }
 
-static const FixGenerator genToFix[] =
+static constexpr FixGenerator genToFix[] =
 {
 	{ "RDB$CONSTRAINT_NAME",	"RDB$RELATION_CONSTRAINTS",	"RDB$CONSTRAINT_NAME",	"INTEG_" 		, DB_VERSION_DDL8 },
 	{ "RDB$FIELD_NAME",			"RDB$FIELDS",				"RDB$FIELD_NAME",		"RDB$"			, DB_VERSION_DDL8 },
@@ -13242,7 +13244,7 @@ IBatch* WriteRelationMeta::createBatch(BurpGlobals* tdgbl, IAttachment* att)
 		// determine batch parameters
 		m_batchInlineBlobLimit = 0;
 
-		const UCHAR items[] = {
+		constexpr UCHAR items[] = {
 			IBatch::INF_BUFFER_BYTES_SIZE,
 			IBatch::INF_BLOB_ALIGNMENT,
 			IBatch::INF_BLOB_HEADER
@@ -13509,7 +13511,7 @@ void WriteRelationMeta::prepareRequest(BurpGlobals* tdgbl)
 		{
 			USHORT l = gds_cvt_blr_dtype[dtype];
 			alignment = type_alignments[l];
-			if (l = type_lengths[l])
+			if ((l = type_lengths[l]) != 0)
 				length = l;
 		}
 
@@ -14033,7 +14035,7 @@ IOBuffer* RestoreRelationTask::read_blob(BurpGlobals* tdgbl, IOBuffer* ioBuf)
 				segments = value;
 
 			// for simplicity, don't split put attribute between buffers
-			const FB_SIZE_T attrLen = (sizeof(SLONG) + 2);
+			constexpr FB_SIZE_T attrLen = (sizeof(SLONG) + 2);
 			checkSpace(&ioBuf, attrLen, &buf, &space);
 
 			*buf++ = attribute;