Menu
▾
▴
[Firebird-checkins] SF.net SVN: firebird:[62359] firebird/trunk
|
From: <asf...@us...> - 2015-10-13 02:22:59
|
Revision: 62359
http://sourceforge.net/p/firebird/code/62359
Author: asfernandes
Date: 2015-10-13 02:22:57 +0000 (Tue, 13 Oct 2015)
Log Message:
-----------
Misc.
Modified Paths:
--------------
firebird/trunk/doc/sql.extensions/README.ddl.txt
firebird/trunk/src/common/classes/ImplementHelper.h
firebird/trunk/src/common/classes/fb_atomic.il
firebird/trunk/src/common/classes/misc/class_test.cpp
firebird/trunk/src/common/classes/misc/lowtab.c
firebird/trunk/src/common/classes/misc/miditab.c
firebird/trunk/src/dsql/StmtNodes.cpp
firebird/trunk/src/jrd/cmp.cpp
firebird/trunk/src/jrd/ext.cpp
firebird/trunk/src/jrd/vio.cpp
firebird/trunk/src/utilities/fbcpl/fbdialog.cpp
Modified: firebird/trunk/doc/sql.extensions/README.ddl.txt
===================================================================
--- firebird/trunk/doc/sql.extensions/README.ddl.txt 2015-10-13 01:49:11 UTC (rev 62358)
+++ firebird/trunk/doc/sql.extensions/README.ddl.txt 2015-10-13 02:22:57 UTC (rev 62359)
@@ -483,6 +483,6 @@
In some cases it's desired to keep shadow file after dropping shadow (for example for
backup purporse). In FB3 appropriate clause is added to DROP SHADOW. Full syntax is:
-DROP SHADOW number [{PRESERVE | DELETE} FILE];
+DROP SHADOW <number> [{PRESERVE | DELETE} FILE];
-Default behavior is to delete file keeping backwards compatibility.
+Default behavior is to delete file, keeping backwards compatibility.
Modified: firebird/trunk/src/common/classes/ImplementHelper.h
===================================================================
--- firebird/trunk/src/common/classes/ImplementHelper.h 2015-10-13 01:49:11 UTC (rev 62358)
+++ firebird/trunk/src/common/classes/ImplementHelper.h 2015-10-13 02:22:57 UTC (rev 62359)
@@ -286,7 +286,7 @@
if (flagOsUnload)
{
const bool dontCleanup = MasterInterfacePtr()->getProcessExiting();
- if (dontCleanup)
+ if (dontCleanup)
{
InstanceControl::cancelCleanup();
return;
Modified: firebird/trunk/src/common/classes/fb_atomic.il
===================================================================
--- firebird/trunk/src/common/classes/fb_atomic.il 2015-10-13 01:49:11 UTC (rev 62358)
+++ firebird/trunk/src/common/classes/fb_atomic.il 2015-10-13 02:22:57 UTC (rev 62359)
@@ -34,7 +34,7 @@
add %g1,%o1,%o2 ! compute the desired result, %g1 + %o1 (value) -> %o2 (temporary)
0:
cas [%o0],%g1,%o2 ! try to CAS it into place
- cmp %g1,%o2 ! compare old to FB_NEW
+ cmp %g1,%o2 ! compare old to new
bne,a,pn %icc,0b ! CAS failed, try again
mov %o2,%g1 ! copy result -> %g1 for next iteration
mov %o2,%o0 ! return old value
@@ -42,7 +42,7 @@
.end
/* sparc version of compare_and_swap, see fb_atomic.h */
-/* extern boolean_t compare_and_swap_il(volatile unsigned *word_addr, unsigned *old_val_addr, int FB_NEW_val); */
+/* extern boolean_t compare_and_swap_il(volatile unsigned *word_addr, unsigned *old_val_addr, int new_val); */
.inline compare_and_swap_il,12
membar #LoadStore|#StoreStore
Modified: firebird/trunk/src/common/classes/misc/class_test.cpp
===================================================================
--- firebird/trunk/src/common/classes/misc/class_test.cpp 2015-10-13 01:49:11 UTC (rev 62358)
+++ firebird/trunk/src/common/classes/misc/class_test.cpp 2015-10-13 02:22:57 UTC (rev 62359)
@@ -126,7 +126,8 @@
}
}
printf(" DONE\n");
-/*
+
+ /***
printf("Verify AND operation for correctness (and forward iterator)");
for (i = 0; i < BITMAP_ITEMS; i++) {
tree.add(v1[i]);
@@ -187,7 +188,7 @@
fb_assert((ULONG)tree.current() == or_res->current());
}
printf(" DONE\n");
-*/
+ ***/
}
const FB_SIZE_T TEST_ITEMS = 10000;
Modified: firebird/trunk/src/common/classes/misc/lowtab.c
===================================================================
--- firebird/trunk/src/common/classes/misc/lowtab.c 2015-10-13 01:49:11 UTC (rev 62358)
+++ firebird/trunk/src/common/classes/misc/lowtab.c 2015-10-13 02:22:57 UTC (rev 62359)
@@ -26,7 +26,8 @@
#include <stdio.h>
-main(int ac, char **av)
+
+main(int ac, char** av)
{
int mode = ac < 2 ? 0 : ((*av[1]) - '0');
@@ -40,6 +41,7 @@
{
if (mode == 0)
printf ("\t%d, // %d\n", slot, cur);
+
if (((cur - prev) * 10) / cur > 0)
{
if (mode == 1)
@@ -47,6 +49,7 @@
prev = cur;
++slot;
}
+
cur += dstep;
}
Modified: firebird/trunk/src/common/classes/misc/miditab.c
===================================================================
--- firebird/trunk/src/common/classes/misc/miditab.c 2015-10-13 01:49:11 UTC (rev 62358)
+++ firebird/trunk/src/common/classes/misc/miditab.c 2015-10-13 02:22:57 UTC (rev 62359)
@@ -26,7 +26,8 @@
#include <stdio.h>
-main(int ac, char **av)
+
+main(int ac, char** av)
{
int mode = ac < 2 ? 0 : ((*av[1]) - '0');
@@ -40,13 +41,16 @@
{
if (mode == 0)
printf ("\t%d, // %d\n", slot, cur);
+
if (((cur - prev) * 10) / cur > 0)
{
if (mode == 1)
printf ("\t%d, // %d\n", cur, slot);
+
prev = cur;
++slot;
}
+
cur += dstep;
}
Modified: firebird/trunk/src/dsql/StmtNodes.cpp
===================================================================
--- firebird/trunk/src/dsql/StmtNodes.cpp 2015-10-13 01:49:11 UTC (rev 62358)
+++ firebird/trunk/src/dsql/StmtNodes.cpp 2015-10-13 02:22:57 UTC (rev 62359)
@@ -3122,9 +3122,9 @@
MemoryPool& pool = csb->csb_pool;
if (!node->inputNames)
- node->inputNames = FB_NEW_POOL (pool) EDS::ParamNames(pool);
+ node->inputNames = FB_NEW_POOL(pool) EDS::ParamNames(pool);
- MetaName* newName = FB_NEW_POOL (pool) MetaName(pool, name);
+ MetaName* newName = FB_NEW_POOL(pool) MetaName(pool, name);
node->inputNames->add(newName);
}
}
Modified: firebird/trunk/src/jrd/cmp.cpp
===================================================================
--- firebird/trunk/src/jrd/cmp.cpp 2015-10-13 01:49:11 UTC (rev 62358)
+++ firebird/trunk/src/jrd/cmp.cpp 2015-10-13 02:22:57 UTC (rev 62359)
@@ -163,17 +163,17 @@
// 26.09.2002 Nickolay Samofatov: default memory pool will become statement pool
// and will be freed by CMP_release
- MemoryPool* const FB_NEW_pool = att->createPool();
+ MemoryPool* const new_pool = att->createPool();
try
{
- Jrd::ContextPoolHolder context(tdbb, FB_NEW_pool);
+ Jrd::ContextPoolHolder context(tdbb, new_pool);
CompilerScratch* csb =
PAR_parse(tdbb, blr, blr_length, internal_flag, dbginfo_length, dbginfo);
request = JrdStatement::makeRequest(tdbb, csb, internal_flag);
- FB_NEW_pool->setStatsGroup(request->req_memory_stats);
+ new_pool->setStatsGroup(request->req_memory_stats);
#ifdef CMP_DEBUG
if (csb->csb_dump.hasData())
@@ -205,7 +205,7 @@
if (request)
CMP_release(tdbb, request);
else
- att->deletePool(FB_NEW_pool);
+ att->deletePool(new_pool);
ERR_punt();
}
@@ -369,7 +369,7 @@
*
* Functional description
* Post access to security class to request.
- * We append the FB_NEW security class to the existing list of
+ * We append the new security class to the existing list of
* security classes for that request.
*
**************************************/
Modified: firebird/trunk/src/jrd/ext.cpp
===================================================================
--- firebird/trunk/src/jrd/ext.cpp 2015-10-13 01:49:11 UTC (rev 62358)
+++ firebird/trunk/src/jrd/ext.cpp 2015-10-13 02:22:57 UTC (rev 62359)
@@ -121,7 +121,7 @@
#endif
static const char* const FOPEN_READ_ONLY = "rb";
- FILE *ext_fopen(Database* dbb, ExternalFile* ext_file)
+ FILE* ext_fopen(Database* dbb, ExternalFile* ext_file)
{
const char* file_name = ext_file->ext_filename;
Modified: firebird/trunk/src/jrd/vio.cpp
===================================================================
--- firebird/trunk/src/jrd/vio.cpp 2015-10-13 01:49:11 UTC (rev 62358)
+++ firebird/trunk/src/jrd/vio.cpp 2015-10-13 02:22:57 UTC (rev 62359)
@@ -1738,7 +1738,8 @@
else if (EVL_field(0, rpb->rpb_record, f_file_shad_num, &desc2) &&
(id = MOV_get_long(&desc2, 0)))
{
- if (!(file_flags & FILE_inactive)) {
+ if (!(file_flags & FILE_inactive))
+ {
if (file_flags & FILE_nodelete)
DFW_post_work(transaction, dfw_delete_shadow_nodelete, &desc, id);
else
Modified: firebird/trunk/src/utilities/fbcpl/fbdialog.cpp
===================================================================
--- firebird/trunk/src/utilities/fbcpl/fbdialog.cpp 2015-10-13 01:49:11 UTC (rev 62358)
+++ firebird/trunk/src/utilities/fbcpl/fbdialog.cpp 2015-10-13 02:22:57 UTC (rev 62359)
@@ -84,7 +84,7 @@
fb_status.SufficientUserRights = true;
fb_status.ServerName = "";
- FB_NEW_settings = fb_status;
+ new_settings = fb_status;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|