Misc

doc/README.fb_cancel_operation

@@ -20,7 +20,7 @@ states of engine) try to stop running request and error-return to the user.
    - fb_cancel_disable: disable execution of fb_cancel_raise requests for given attachment. It's
 useful when your program executes some critical things (for example, cleanup).
    - fb_cancel_enable: enables previously disabled cancel delivery.
-   - fb_cancel_abort: forcible closed client side of connection. Useful if you need to close 
+   - fb_cancel_abort: forcible close client side of connection. Useful if you need to close 
 connection urgently. All active transactions will be rolled back by server. Success always
 returned to the application. Use with care ! 
 

src/burp/restore.epp

@@ -3892,8 +3892,9 @@ void get_function_arg(BurpGlobals* tdgbl, bool skip_arguments)
 						l = GET_TEXT(X.RDB$FUNCTION_NAME);
 						MISC_terminate(X.RDB$FUNCTION_NAME, temp + prefixLen, l,
 							sizeof(temp) - prefixLen);
-						BURP_verbose (119, temp);
+
 						// msg 119 restoring argument for function %s
+						BURP_verbose(119, temp);
 					}
 					break;
 
@@ -8762,5 +8763,3 @@ void update_view_dbkey_lengths(BurpGlobals* tdgbl)
 
 
 } // namespace
-
-

src/common/classes/Interlock.h

@@ -1,19 +1,19 @@
 /*
- *  
- *     The contents of this file are subject to the Initial 
- *     Developer's Public License Version 1.0 (the "License"); 
- *     you may not use this file except in compliance with the 
- *     License. You may obtain a copy of the License at 
- *     http://www.ibphoenix.com/idpl.html. 
  *
- *     Software distributed under the License is distributed on 
+ *     The contents of this file are subject to the Initial
- *     an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either 
+ *     Developer's Public License Version 1.0 (the "License");
- *     express or implied.  See the License for the specific 
+ *     you may not use this file except in compliance with the
+ *     License. You may obtain a copy of the License at
+ *     http://www.ibphoenix.com/idpl.html.
+ *
+ *     Software distributed under the License is distributed on
+ *     an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either
+ *     express or implied.  See the License for the specific
  *     language governing rights and limitations under the License.
  *
  *     The contents of this file or any work derived from this file
- *     may not be distributed under any other license whatsoever 
+ *     may not be distributed under any other license whatsoever
- *     without the express prior written permission of the original 
+ *     without the express prior written permission of the original
  *     author.
  *
  *

src/isql/extract.epp

@@ -723,7 +723,7 @@ static void get_procedure_args_ods12(const char* proc_name)
  *
  * Functional description
  *	This function extracts the procedure parameters and adds it to the
- *	extract file
+ *	extract file.
  *  Make sure to pass here only the names of procedures that are global.
  *
  **************************************/
@@ -1449,7 +1449,6 @@ static processing_state list_all_grants2(bool show_role_list, const SCHAR* termi
 	else
 		SHOW_grant_roles2(terminator, 0, 0, mangle);
 
-
 	if (isqlGlob.major_ods >= ODS_VERSION12)
 	{
 		// For stored procedures, but ignore procedures inside packages.
@@ -1463,7 +1462,7 @@ static processing_state list_all_grants2(bool show_role_list, const SCHAR* termi
 
 			const processing_state rc =
 				SHOW_grants2(PRC.RDB$PROCEDURE_NAME, terminator, obj_procedure,
-								   first ? banner: 0, mangle);
+								   first ? banner : 0, mangle);
 			if (rc == SKIP)
 				first = false;
 
@@ -1484,7 +1483,7 @@ static processing_state list_all_grants2(bool show_role_list, const SCHAR* termi
 
 			const processing_state rc =
 				SHOW_grants2(PRC.RDB$PROCEDURE_NAME, terminator, obj_procedure,
-								   first ? banner: 0, mangle);
+								   first ? banner : 0, mangle);
 			if (rc == SKIP)
 				first = false;
 
@@ -1505,7 +1504,7 @@ static processing_state list_all_grants2(bool show_role_list, const SCHAR* termi
 			fb_utils::exact_name(PACK.RDB$PACKAGE_NAME);
 			const processing_state rc =
 				SHOW_grants2(PACK.RDB$PACKAGE_NAME, terminator, obj_package_header,
-													first ? banner: 0, mangle);
+													first ? banner : 0, mangle);
 			if (rc == SKIP)
 				first = false;
 		END_FOR

src/isql/isql.h

@@ -254,9 +254,9 @@ const int NO_PACKAGE				= 166;		// There is no package @1 in this database
 const int NO_PACKAGES				= 167;		// There are no packages in this database
 const int NO_SCHEMA					= 168;		// There is no schema @1 in this database
 const int NO_SCHEMAS				= 169;		// There are no schemas in this database
-const int ROWCOUNT_INVALID			= 170;		//Unable to convert @1 to a number for rowcount
+const int ROWCOUNT_INVALID			= 170;		// Unable to convert @1 to a number for rowcount
-const int ROWCOUNT_OUTOF_RANGE		= 171;		//Value @1 for rowcount is out of range. Max value is @2
+const int ROWCOUNT_OUTOF_RANGE		= 171;		// Value @1 for rowcount is out of range. Max value is @2
-const int ROWCOUNT_NEGATIVE			= 172;		//The value (@1) for rowcount must be zero or greater
+const int ROWCOUNT_NEGATIVE			= 172;		// The value (@1) for rowcount must be zero or greater
 
 
 // Initialize types

src/remote/server.cpp

@@ -5236,7 +5236,7 @@ bool Worker::wait(int timeout)
 		return true;
 
 	remove();
-	return false; 
+	return false;
 }
 
 void Worker::setState(const bool active)