[Firebird-checkins] CVS: firebird2/src/utilities/ibmgr srvrmgr.cpp,1.4,1.5 ibmgr.cpp,1.6,1.7

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

Build Version :  T2.0.0.4422 Firebird 2.0 Alpha 1

(writeBuildNum.sh,v 1.4421 2003/08/26 18:45:45 brodsom Exp  )

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

Modified Files:
	srvrmgr.cpp ibmgr.cpp 
Log Message:
Remove BOOLEAN, TRUE and FALSE macros

Index: srvrmgr.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/utilities/ibmgr/srvrmgr.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -b -U3 -r1.4 -r1.5
--- srvrmgr.cpp	26 Aug 2003 06:54:45 -0000	1.4
+++ srvrmgr.cpp	26 Aug 2003 18:45:44 -0000	1.5
@@ -107,12 +107,12 @@
  **************************************/
 	assert(data->attached || data->reattach);
 
-/* If reattach is TRUE and we currently attached, then we
+/* If reattach is true and we currently attached, then we
    will detach from service. This is potentially dangerous
-   situation, because if shutdown is TRUE (server shutdown 
+   situation, because if shutdown is true (server shutdown 
    was initiated) server will be shutdowned.
    I do not check the shutdown flag here because reattach
-   could be TRUE only if shutdown has not been initiated.
+   could be true only if shutdown has not been initiated.
 */
 	if (data->operation != OP_START)
 		if (data->reattach) {
@@ -122,14 +122,14 @@
 				/* Attached flag should be NULL after detach_service
 				 */
 				detach_service(data);
-			if (attach_service(data) == FALSE)
+			if (attach_service(data) == false)
 				return MSG_ATTFAIL;
 			data->reattach = 0;
 		}
 
 	switch (data->operation) {
 	case OP_START:
-		if (start_server(data) == FALSE)
+		if (start_server(data) == false)
 			return MSG_STARTFAIL;
 		break;
 
@@ -138,7 +138,7 @@
 		case SOP_NONE:
 		case SOP_SHUT_NOW:
 			data->shutdown = true;
-			if (start_shutdown(data) == FALSE) {
+			if (start_shutdown(data) == false) {
 				data->shutdown = false;
 				return MSG_SSHUTFAIL;
 			}
@@ -167,7 +167,7 @@
 	case OP_PRINT:
 		switch (data->suboperation) {
 		case SOP_PRINT_POOL:
-			if (print_pool(data) == FALSE)
+			if (print_pool(data) == false)
 				return MSG_PRPOOLFAIL;
 			return MSG_PRPOOLOK;
 		}
@@ -389,7 +389,7 @@
 	if (status[0] == 1 && status[1] > 0) {
 /* If as a result of detach_service server has been
    shutdowned we will get an error.
-   MMM - need to check for that error and return TRUE
+   MMM - need to check for that error and return true
 */
 #ifdef DEBUG
 		ib_fprintf(OUTFILE, "ERROR: %lu\n", status[1]);

Index: ibmgr.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/utilities/ibmgr/ibmgr.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -b -U3 -r1.6 -r1.7
--- ibmgr.cpp	26 Aug 2003 06:54:45 -0000	1.6
+++ ibmgr.cpp	26 Aug 2003 18:45:45 -0000	1.7
@@ -312,7 +312,8 @@
 	TEXT *p, *q, *string, msg[MSG_LEN];
 	IN_SW_TAB in_sw_tab;
 	USHORT in_sw;
-	USHORT last_sw, sw_version;
+	USHORT last_sw;
+	bool sw_version = false;
 	int l;
 	SSHORT err_msg_no;
 
@@ -322,7 +323,6 @@
 */
 	*quitflag = false;
 	last_sw = IN_SW_IBMGR_0;
-	sw_version = FALSE;
 	for (--argc; argc > 0; argc--) {
 		string = *++argv;
 		if (*string == '?')