[Firebird-checkins] SF.net SVN: firebird:[59886] firebird/trunk

[<asf...@us...>]

Revision: 59886
          http://sourceforge.net/p/firebird/code/59886
Author:   asfernandes
Date:     2014-07-18 01:52:24 +0000 (Fri, 18 Jul 2014)
Log Message:
-----------
Misc.

Modified Paths:
--------------
    firebird/trunk/doc/sql.extensions/README.ddl_access.txt
    firebird/trunk/src/common/classes/Switches.h
    firebird/trunk/src/common/common.h
    firebird/trunk/src/common/xdr.cpp
    firebird/trunk/src/include/types_pub.h
    firebird/trunk/src/isql/isql.epp
    firebird/trunk/src/jrd/ods.h

Modified: firebird/trunk/doc/sql.extensions/README.ddl_access.txt
===================================================================
--- firebird/trunk/doc/sql.extensions/README.ddl_access.txt	2014-07-18 00:33:51 UTC (rev 59885)
+++ firebird/trunk/doc/sql.extensions/README.ddl_access.txt	2014-07-18 01:52:24 UTC (rev 59886)
@@ -7,13 +7,13 @@
 
 Syntax is:
 
-GRANT CREATE <OBJECT> TO [USER | ROLE] <user/role name> [with grant option];
-GRANT ALTER ANY <OBJECT> TO [USER | ROLE] <user/role name> [with grant option];
-GRANT DROP ANY <OBJECT> TO [USER | ROLE] <user/role name> [with grant option];
+GRANT CREATE <OBJECT> TO [USER | ROLE] <user/role name> [WITH GRANT OPTION];
+GRANT ALTER ANY <OBJECT> TO [USER | ROLE] <user/role name> [WITH GRANT OPTION];
+GRANT DROP ANY <OBJECT> TO [USER | ROLE] <user/role name> [WITH GRANT OPTION];
 
-REVOKE [grant option for] CREATE <OBJECT> FROM [USER | ROLE] <user/role name>;
-REVOKE [grant option for] ALTER ANY <OBJECT> FROM [USER | ROLE] <user/role name>;
-REVOKE [grant option for] DROP ANY <OBJECT> FROM [USER | ROLE] <user/role name>;
+REVOKE [GRANT OPTION FOR] CREATE <OBJECT> FROM [USER | ROLE] <user/role name>;
+REVOKE [GRANT OPTION FOR] ALTER ANY <OBJECT> FROM [USER | ROLE] <user/role name>;
+REVOKE [GRANT OPTION FOR] DROP ANY <OBJECT> FROM [USER | ROLE] <user/role name>;
 
 Where <OBJECT> could be:
 TABLE, VIEW, PROCEDURE, FUNCTION, PACKAGE, GENERATOR, SEQUENCE, DOMAIN, 

Modified: firebird/trunk/src/common/classes/Switches.h
===================================================================
--- firebird/trunk/src/common/classes/Switches.h	2014-07-18 00:33:51 UTC (rev 59885)
+++ firebird/trunk/src/common/classes/Switches.h	2014-07-18 01:52:24 UTC (rev 59886)
@@ -108,7 +108,7 @@
 	const bool		m_copy;				// was m_base copied into m_table for modifications?
 	const bool		m_minLength;		// is the field in_sw_min_length meaningful?
 	in_sw_tab_t*	m_table;			// modifiable copy
-	FB_SIZE_T*			m_opLengths;		// array of in_sw_name's lengths to avoid recalculation
+	FB_SIZE_T*		m_opLengths;		// array of in_sw_name's lengths to avoid recalculation
 };
 
 #endif // CLASSES_SWITCHES

Modified: firebird/trunk/src/common/common.h
===================================================================
--- firebird/trunk/src/common/common.h	2014-07-18 00:33:51 UTC (rev 59885)
+++ firebird/trunk/src/common/common.h	2014-07-18 01:52:24 UTC (rev 59886)
@@ -888,7 +888,7 @@
 #endif
 
 #define FB_UNUSED(value) do { if (value) {} } while (false)
-#define FB_UNUSED_VAR(value) (void)value;
+#define FB_UNUSED_VAR(value) (void) value
 
 // 30 Dec 2002. Nickolay Samofatov
 // This needs to be checked for all supported platforms
@@ -977,7 +977,10 @@
 
 const FB_SIZE_T FB_MAX_SIZEOF = ~FB_SIZE_T(0); // Assume FB_SIZE_T is unsigned
 
-inline FB_SIZE_T fb_strlen(const char* str) { return static_cast<FB_SIZE_T>(strlen(str)); }
+inline FB_SIZE_T fb_strlen(const char* str)
+{
+	return static_cast<FB_SIZE_T>(strlen(str));
+}
 
 
 #endif /* COMMON_COMMON_H */

Modified: firebird/trunk/src/common/xdr.cpp
===================================================================
--- firebird/trunk/src/common/xdr.cpp	2014-07-18 00:33:51 UTC (rev 59885)
+++ firebird/trunk/src/common/xdr.cpp	2014-07-18 01:52:24 UTC (rev 59886)
@@ -387,7 +387,6 @@
  **************************************/
 	fb_assert(sizeof(float) == sizeof(SLONG));
 
-
 	switch (xdrs->x_op)
 	{
 	case XDR_ENCODE:

Modified: firebird/trunk/src/include/types_pub.h
===================================================================
--- firebird/trunk/src/include/types_pub.h	2014-07-18 00:33:51 UTC (rev 59885)
+++ firebird/trunk/src/include/types_pub.h	2014-07-18 01:52:24 UTC (rev 59886)
@@ -64,9 +64,9 @@
 #ifdef FB_USE_SIZE_T
 /* NS: This is how things were done in original Firebird port to 64-bit platforms
    Basic classes use these quantities. However in many places in the engine and
-   external libraries 32-bit quantities are used to hold sizes of objects. 
+   external libraries 32-bit quantities are used to hold sizes of objects.
    This produces many warnings. This also produces incredibly dirty interfaces,
-   when functions take size_t as argument, but only handle 32 bits internally 
+   when functions take size_t as argument, but only handle 32 bits internally
    without any bounds checking.                                                    */
 typedef size_t FB_SIZE_T;
 typedef intptr_t FB_SSIZE_T;

Modified: firebird/trunk/src/isql/isql.epp
===================================================================
--- firebird/trunk/src/isql/isql.epp	2014-07-18 00:33:51 UTC (rev 59885)
+++ firebird/trunk/src/isql/isql.epp	2014-07-18 01:52:24 UTC (rev 59886)
@@ -7417,7 +7417,7 @@
 				isqlGlob.printf("%-*.*s%s", var->length, var->length, str2, NEWLINE);
 			else
 			{
-				IcuUtil::pad(p, var->charSet, 
+				IcuUtil::pad(p, var->charSet,
 					static_cast<unsigned>(strnlen(var->value.asChar, var->length)), var->value.asChar, length, false);
 				strcat(p, " ");
 			}

Modified: firebird/trunk/src/jrd/ods.h
===================================================================
--- firebird/trunk/src/jrd/ods.h	2014-07-18 00:33:51 UTC (rev 59885)
+++ firebird/trunk/src/jrd/ods.h	2014-07-18 01:52:24 UTC (rev 59886)
@@ -263,7 +263,7 @@
 	UCHAR btr_nodes[1];
 };
 
-// NS 2014-07-17: You can define this thing as "const FB_SIZE_t ...", and it works 
+// NS 2014-07-17: You can define this thing as "const FB_SIZE_t ...", and it works
 // for standards-conforming compilers (recent GCC and MSVC will do)
 // But older versions might have a problem, so I leave #define in place for now
 #define BTR_SIZE static_cast<FB_SIZE_T>(offsetof(Ods::btree_page, btr_nodes[0]))

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.