[Firebird-checkins] CVS: firebird2/src/utilities/gsec gsec.cpp,1.19,1.20 gsec.h,1.8,1.9 gsec_proto.h,1.6,1.7

[Claudio V. C. <ro...@us...>]

Build Version :  T2.0.0.6511 Firebird 2.0 UNSTABLE

(writeBuildNum.sh,v 1.6513 2004/02/20 06:43:25 robocop Exp  )

Update of /cvsroot/firebird/firebird2/src/utilities/gsec
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3672/src/utilities/gsec

Modified Files:
	gsec.cpp gsec.h gsec_proto.h 
Log Message:
Big cleanup.
God have pity on platform maintainers.
I only can compile/test Win32; sorry, folks.

Index: gsec.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/utilities/gsec/gsec.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -b -U3 -r1.19 -r1.20
--- gsec.cpp	7 Jan 2004 10:22:16 -0000	1.19
+++ gsec.cpp	20 Feb 2004 06:43:22 -0000	1.20
@@ -210,7 +210,7 @@
 	else if (argc > 1 && !strcmp(argv[1], "-svc_thd")) {
 		tdsec->tsec_service_gsec = true;
 		tdsec->tsec_service_thd = true;
-		tdsec->tsec_service_blk = (SVC) output_data;
+		tdsec->tsec_service_blk = (svc*) output_data;
 		tdsec->tsec_status = tdsec->tsec_service_blk->svc_status;
 		argv++;
 		argc--;
@@ -301,7 +301,7 @@
 			 * will cause the service to wait for the client to request data.  However,
 			 * if the server is not signaled, then the client can never request anything */
 			if (user_data->operation == DIS_OPER)
-				SVC_STARTED(tdsec->tsec_service_blk);
+				tdsec->tsec_service_blk->svc_started();
 #endif
 			ret = SECURITY_exec_line(status, db_handle, user_data,
 									 data_print, NULL);
@@ -351,7 +351,7 @@
 	}	// try
 	catch (const std::exception&) {
 		/* All calls to gsec_exit(), normal and error exits, wind up here */
-		SVC_STARTED(tdsec->tsec_service_blk);
+		tdsec->tsec_service_blk->svc_started();
 		tdsec->tsec_env = NULL;
 		const int exit_code = tdsec->tsec_exit_code;
 
@@ -1230,7 +1230,7 @@
 							isc_arg_string, arg2,
 							isc_arg_string, arg3,
 							isc_arg_string, arg4, isc_arg_string, arg5);
-	SVC_STARTED(tdsec->tsec_service_blk);
+	tdsec->tsec_service_blk->svc_started();
 #else
 	tsec* tdsec = GET_THREAD_DATA;
 #endif

Index: gsec.h
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/utilities/gsec/gsec.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -b -U3 -r1.8 -r1.9
--- gsec.h	22 Dec 2003 10:00:59 -0000	1.8
+++ gsec.h	20 Feb 2004 06:43:22 -0000	1.9
@@ -136,7 +136,7 @@
     pfn_svc_output		tsec_output_proc;
     svc*				tsec_output_data;
     IB_FILE*			tsec_output_file;
-    SVC					tsec_service_blk;
+    svc*				tsec_service_blk;
 } *TSEC;
 
 #define GsecMsg0	0	/* empty message */

Index: gsec_proto.h
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/utilities/gsec/gsec_proto.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -b -U3 -r1.6 -r1.7
--- gsec_proto.h	22 Dec 2003 10:00:59 -0000	1.6
+++ gsec_proto.h	20 Feb 2004 06:43:22 -0000	1.7
@@ -2,7 +2,7 @@
 #define GSEC_PROTO_H
 
 #ifdef SUPERSERVER
-int		GSEC_main(SVC service);
+int		GSEC_main(svc* service);
 #endif
 
 // Output reporting utilities