[Firebird-checkins] CVS: firebird2/src/utilities/install registry.cpp,1.1,1.2 regis_proto.h,1.1,1.2 install_svc.cpp,1.1,1.2 install_reg.cpp,1.2,1.3

[Blas R. S. <br...@us...>]

Build Version :  T2.0.0.4417 Firebird 2.0 Alpha 1

(writeBuildNum.sh,v 1.4416 2003/08/26 10:42:47 brodsom Exp  )

Update of /cvsroot/firebird/firebird2/src/utilities/install
In directory sc8-pr-cvs1:/tmp/cvs-serv23977

Modified Files:
	registry.cpp regis_proto.h install_svc.cpp install_reg.cpp 
Log Message:
Remove BOOLEAN, TRUE and FALSE macros

Index: registry.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/utilities/install/registry.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -b -U3 -r1.1 -r1.2
--- registry.cpp	15 Jul 2003 02:40:09 -0000	1.1
+++ registry.cpp	26 Aug 2003 10:42:46 -0000	1.2
@@ -35,7 +35,7 @@
 #include "../utilities/install/regis_proto.h"
 #include "../utilities/install/registry.h"
 
-static USHORT remove_subkeys(HKEY, USHORT, USHORT(*)(SLONG, TEXT *, HKEY));
+static USHORT remove_subkeys(HKEY, bool, USHORT(*)(SLONG, TEXT *, HKEY));
 
 USHORT REGISTRY_install(HKEY hkey_node,
 						TEXT * directory, USHORT(*err_handler)(SLONG, TEXT *, HKEY))
@@ -81,7 +81,7 @@
 						  (DWORD) sizeof(GDS_VERSION))) != ERROR_SUCCESS) {
 		(*err_handler) (status, "RegSetValueEx", hkey_kit);
 		if (disp == REG_CREATED_NEW_KEY)
-			REGISTRY_remove(hkey_node, TRUE, err_handler);
+			REGISTRY_remove(hkey_node, true, err_handler);
 		return FB_FAILURE;
 	}
 
@@ -99,7 +99,7 @@
 								(DWORD)(len + 1))) != ERROR_SUCCESS) {
 	    (*err_handler) (status, "RegSetValueEx", hkey_kit);
     	if (disp == REG_CREATED_NEW_KEY)
-			REGISTRY_remove(hkey_node, TRUE, err_handler);
+			REGISTRY_remove(hkey_node, true, err_handler);
     	return FB_FAILURE;
     }
 
@@ -108,7 +108,7 @@
 								1)) != ERROR_SUCCESS) {
 	    (*err_handler) (status, "RegSetValueEx", hkey_kit);
     	if (disp == REG_CREATED_NEW_KEY)
-			REGISTRY_remove(hkey_node, TRUE, err_handler);
+			REGISTRY_remove(hkey_node, true, err_handler);
     	return FB_FAILURE;
     }
 */
@@ -119,7 +119,7 @@
 
 
 USHORT REGISTRY_remove(HKEY hkey_node,
-					   USHORT silent_flag, USHORT(*err_handler)(SLONG, TEXT *, HKEY))
+					   bool silent_flag, USHORT(*err_handler)(SLONG, TEXT *, HKEY))
 {
 /**************************************
  *
@@ -164,7 +164,7 @@
 
 static USHORT remove_subkeys(
 							 HKEY hkey,
-							 USHORT silent_flag, USHORT(*err_handler)(SLONG, TEXT *, HKEY))
+							 bool silent_flag, USHORT(*err_handler)(SLONG, TEXT *, HKEY))
 {
 /**************************************
  *

Index: regis_proto.h
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/utilities/install/regis_proto.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -b -U3 -r1.1 -r1.2
--- regis_proto.h	15 Jul 2003 02:40:09 -0000	1.1
+++ regis_proto.h	26 Aug 2003 10:42:46 -0000	1.2
@@ -25,6 +25,6 @@
 #define _UTILITIES_REGIS_PROTO_H_
 
 extern USHORT	REGISTRY_install (HKEY, TEXT *, USHORT (*)(SLONG, TEXT *, HKEY));
-extern USHORT	REGISTRY_remove (HKEY, USHORT, USHORT (*)(SLONG, TEXT *, HKEY));
+extern USHORT	REGISTRY_remove (HKEY, bool, USHORT (*)(SLONG, TEXT *, HKEY));
 
 #endif /* _UTILITIES_REGIS_PROTO_H_ */

Index: install_svc.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/utilities/install/install_svc.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -b -U3 -r1.1 -r1.2
--- install_svc.cpp	15 Jul 2003 02:40:09 -0000	1.1
+++ install_svc.cpp	26 Aug 2003 10:42:46 -0000	1.2
@@ -65,13 +65,14 @@
  *
  **************************************/
 	TEXT **end, *p, *q, *cmd, *directory;
-	USHORT sw_command, sw_version, sw_startup, sw_mode, sw_guardian, sw_arch;
+	USHORT sw_command, sw_startup, sw_mode, sw_guardian, sw_arch;
+	bool sw_version;
 	USHORT i, status;
 	SC_HANDLE manager, service;
 
 	directory = NULL;
 	sw_command = COMMAND_NONE;
-	sw_version = FALSE;
+	sw_version = false;
 	sw_startup = STARTUP_DEMAND;
 	sw_mode = DEFAULT_CLIENT;
 	sw_guardian = NO_GUARDIAN;
@@ -126,7 +127,7 @@
 				break;
 
 			case 'Z':
-				sw_version = TRUE;
+				sw_version = true;
 				break;
 
 			case 'G':

Index: install_reg.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/utilities/install/install_reg.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -b -U3 -r1.2 -r1.3
--- install_reg.cpp	12 Aug 2003 10:01:21 -0000	1.2
+++ install_reg.cpp	26 Aug 2003 10:42:46 -0000	1.3
@@ -57,13 +57,14 @@
  *
  **************************************/
 	TEXT **end, *p, *q, *cmd, *directory;
-	USHORT sw_command, sw_version;
+	USHORT sw_command;
+	bool sw_version;
 	USHORT i, ret;
 	HKEY hkey_node;
 
 	directory = NULL;
 	sw_command = COMMAND_NONE;
-	sw_version = FALSE;
+	sw_version = false;
 
 	end = argv + argc;
 	while (++argv < end)
@@ -85,7 +86,7 @@
 			p = *argv + 1;
 			switch (UPPER(*p)) {
 			case 'Z':
-				sw_version = TRUE;
+				sw_version = true;
 				break;
 
 			default:
@@ -115,7 +116,7 @@
 		break;
 
 	case COMMAND_REMOVE:
-		ret = REGISTRY_remove(hkey_node, FALSE, reg_error);
+		ret = REGISTRY_remove(hkey_node, false, reg_error);
 		if (ret != FB_SUCCESS)
 			ib_printf("Firebird has not been deleted from the registry.\n");
 		else