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

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

Revision: 63083
          http://sourceforge.net/p/firebird/code/63083
Author:   asfernandes
Date:     2016-03-03 22:52:03 +0000 (Thu, 03 Mar 2016)
Log Message:
-----------
Warnings.

Modified Paths:
--------------
    firebird/trunk/examples/dbcrypt/CryptKeyHolder.cpp
    firebird/trunk/src/common/call_service.cpp

Modified: firebird/trunk/examples/dbcrypt/CryptKeyHolder.cpp
===================================================================
--- firebird/trunk/examples/dbcrypt/CryptKeyHolder.cpp	2016-03-03 20:32:45 UTC (rev 63082)
+++ firebird/trunk/examples/dbcrypt/CryptKeyHolder.cpp	2016-03-03 22:52:03 UTC (rev 63083)
@@ -255,7 +255,7 @@
 
 	char kn[40];
 	strcpy(kn, "Key");
-	strncat(kn, keyName, sizeof(kn));
+	strncat(kn, keyName, sizeof(kn) - 3 - 1);
 	kn[sizeof(kn) - 1] = 0;
 
 	IConfigEntry* confEntry = getEntry(status, kn);

Modified: firebird/trunk/src/common/call_service.cpp
===================================================================
--- firebird/trunk/src/common/call_service.cpp	2016-03-03 20:32:45 UTC (rev 63082)
+++ firebird/trunk/src/common/call_service.cpp	2016-03-03 22:52:03 UTC (rev 63083)
@@ -257,7 +257,7 @@
 		if (status[1] == 0)
 			return svc_handle;
 		if (status[1] != isc_network_error)
-			return NULL;
+			return 0;
 
 		fb_utils::init_status(status);
 	}

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