Menu
▾
▴
[Firebird-checkins] SF.net SVN: firebird:[62072] firebird/trunk
|
From: <asf...@us...> - 2015-08-02 15:51:04
|
Revision: 62072
http://sourceforge.net/p/firebird/code/62072
Author: asfernandes
Date: 2015-08-02 15:51:01 +0000 (Sun, 02 Aug 2015)
Log Message:
-----------
Misc.
Modified Paths:
--------------
firebird/trunk/doc/README.trusted_authentication
firebird/trunk/src/burp/burp.cpp
firebird/trunk/src/common/classes/SyncObject.cpp
firebird/trunk/src/isql/isql.epp
firebird/trunk/src/jrd/validation.h
firebird/trunk/src/yvalve/utl.cpp
Modified: firebird/trunk/doc/README.trusted_authentication
===================================================================
--- firebird/trunk/doc/README.trusted_authentication 2015-08-02 07:14:37 UTC (rev 62071)
+++ firebird/trunk/doc/README.trusted_authentication 2015-08-02 15:51:01 UTC (rev 62072)
@@ -8,7 +8,7 @@
Parameter Authentication in firebird.conf file is not used any more - it's replaced with more
generic AuthServer (and AuthClient) parameters. Also to use trusted authentication one should turn
off mandatory wire encryption because Win_Sspi plugin (which implements trusted authentication on
-windows) does not provide an encryption key. So minimum changes in firebird.conf you need is:
+Windows) does not provide an encryption key. So minimum changes in firebird.conf you need is:
AuthServer = Srp, Win_Sspi
WireCrypt = Enabled
Modified: firebird/trunk/src/burp/burp.cpp
===================================================================
--- firebird/trunk/src/burp/burp.cpp 2015-08-02 07:14:37 UTC (rev 62071)
+++ firebird/trunk/src/burp/burp.cpp 2015-08-02 15:51:01 UTC (rev 62072)
@@ -127,7 +127,7 @@
char width;
};
static const char* STAT_CHARS = "TDRW";
-static const StatFormat STAT_FORMATS[] =
+static const StatFormat STAT_FORMATS[] =
{
{"time", "%4lu.%03u ", 9},
{"delta", "%2lu.%03u ", 7},
@@ -838,25 +838,29 @@
case IN_SW_BURP_STATS:
if (tdgbl->gbl_stat_flags)
BURP_error(334, true, SafeArg() << in_sw_tab->in_sw_name);
+
if (++itr >= argc)
- BURP_error(366, true); // statistics parameter missing
+ BURP_error(366, true); // statistics parameter missing
- {
+ { // scope
const char* perf_val = argv[itr];
const char* c = perf_val;
size_t len = strlen(STAT_CHARS);
+
for (; *c && len; c++, len--)
{
const char* pos = strchr(STAT_CHARS, toupper(*c));
if (!pos)
- BURP_error(367, true, SafeArg() << *c); // wrong char "@1" at statistics parameter
+ BURP_error(367, true, SafeArg() << *c); // wrong char "@1" at statistics parameter
tdgbl->gbl_stat_flags |= 1 << (pos - STAT_CHARS);
}
+
if (*c)
- BURP_error(368, true); // 'too many chars at statistics parameter'
+ BURP_error(368, true); // too many chars at statistics parameter
}
break;
+
case IN_SW_BURP_CO:
if (tdgbl->gbl_sw_convert_ext_tables)
BURP_error(334, true, SafeArg() << in_sw_tab->in_sw_name);
@@ -2461,7 +2465,7 @@
isc_database_info(status, &db_handle, sizeof(info), info, sizeof(buffer), buffer);
- char *p = buffer, *const e = buffer + sizeof(buffer);
+ char* p = buffer, *const e = buffer + sizeof(buffer);
while (p < e)
{
int flag = -1;
@@ -2483,7 +2487,7 @@
if (flag != -1)
{
const int len = isc_vax_integer(p + 1, 2);
- stats[flag] = isc_portable_integer((ISC_UCHAR*)p + 1 + 2, len);
+ stats[flag] = isc_portable_integer((ISC_UCHAR*) p + 1 + 2, len);
p += len + 3;
}
}
@@ -2559,6 +2563,7 @@
if (gbl_stat_flags & (1 << i))
burp_output(false, "%-*s", STAT_FORMATS[i].width, STAT_FORMATS[i].header);
}
+
burp_output(false, "\n");
}
Modified: firebird/trunk/src/common/classes/SyncObject.cpp
===================================================================
--- firebird/trunk/src/common/classes/SyncObject.cpp 2015-08-02 07:14:37 UTC (rev 62071)
+++ firebird/trunk/src/common/classes/SyncObject.cpp 2015-08-02 15:51:01 UTC (rev 62072)
@@ -73,7 +73,7 @@
++waiters;
//while (true)
- while (!waitingThreads) // fair locking
+ while (!waitingThreads) // fair locking
{
const AtomicCounter::counter_type oldState = lockState;
if (oldState < 0)
Modified: firebird/trunk/src/isql/isql.epp
===================================================================
--- firebird/trunk/src/isql/isql.epp 2015-08-02 07:14:37 UTC (rev 62071)
+++ firebird/trunk/src/isql/isql.epp 2015-08-02 15:51:01 UTC (rev 62072)
@@ -880,6 +880,7 @@
{
// Read the line
char buffer[MAX_USHORT];
+
if (fgets(buffer, sizeof(buffer), Filelist->Ifp().indev_fpointer) != NULL)
{
size_t lineSize = strlen(buffer);
@@ -5961,7 +5962,9 @@
txt.assign(v.value.asVary->vary_string, v.value.asVary->vary_length);
break;
}
+
txt.trim();
+
if (fieldInfo[i].skip && txt == fieldInfo[i].skip)
continue;
@@ -5971,6 +5974,7 @@
if (wasOut)
isqlGlob.printf("%s", NEWLINE);
+
return true;
}
Modified: firebird/trunk/src/jrd/validation.h
===================================================================
--- firebird/trunk/src/jrd/validation.h 2015-08-02 07:14:37 UTC (rev 62071)
+++ firebird/trunk/src/jrd/validation.h 2015-08-02 15:51:01 UTC (rev 62072)
@@ -163,7 +163,7 @@
explicit UsedBdb(BufferDesc* _bdb) : bdb(_bdb), count(1) {}
BufferDesc* bdb;
- int count;
+ int count;
static const ULONG generate(const UsedBdb& p)
{
@@ -179,7 +179,6 @@
UsedBdbs vdr_used_bdbs;
-
void cleanup();
RTN corrupt(int, const jrd_rel*, ...);
FETCH_CODE fetch_page(bool validate, ULONG, USHORT, WIN*, void*);
Modified: firebird/trunk/src/yvalve/utl.cpp
===================================================================
--- firebird/trunk/src/yvalve/utl.cpp 2015-08-02 07:14:37 UTC (rev 62071)
+++ firebird/trunk/src/yvalve/utl.cpp 2015-08-02 15:51:01 UTC (rev 62072)
@@ -1038,7 +1038,7 @@
}
private:
- ClumpletWriter *pb;
+ ClumpletWriter* pb;
unsigned char nextTag;
string strVal;
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
