Changeset: 441da39f0afa for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=441da39f0afa
Modified Files:
clients/mapilib/Makefile.ag
clients/odbc/driver/SQLGetDiagRec.c
clients/odbc/winsetup/Makefile.ag
common/utils/mutils.c
gdk/gdk_system.c
Branch: default
Log Message:
Fixes to the use of strcpy_len.
diffs (71 lines):
diff --git a/clients/mapilib/Makefile.ag b/clients/mapilib/Makefile.ag
--- a/clients/mapilib/Makefile.ag
+++ b/clients/mapilib/Makefile.ag
@@ -15,6 +15,7 @@ lib_mapi = {
LIBS = ../../common/options/libmoptions \
../../common/utils/libmcrypt \
WIN32?../../common/stream/libstream \
+ WIN32?../../common/utils/libmutils \
WIN32?$(SOCKET_LIBS) \
WIN32?$(openssl_LIBS)
}
diff --git a/clients/odbc/driver/SQLGetDiagRec.c
b/clients/odbc/driver/SQLGetDiagRec.c
--- a/clients/odbc/driver/SQLGetDiagRec.c
+++ b/clients/odbc/driver/SQLGetDiagRec.c
@@ -110,7 +110,7 @@ MNDBGetDiagRec(SQLSMALLINT HandleType,
* required by the ODBC spec and used to
* determine where the error originated
*/
- msgLen = strconcat_len((char *) MessageText, BufferLength,
ODBCErrorMsgPrefix, msg, NULL);
+ msgLen = (SQLSMALLINT) strconcat_len((char *) MessageText,
BufferLength, ODBCErrorMsgPrefix, msg, NULL);
if (MessageText == NULL || msgLen >= BufferLength) {
/* it didn't fit */
retCode = SQL_SUCCESS_WITH_INFO;
diff --git a/clients/odbc/winsetup/Makefile.ag
b/clients/odbc/winsetup/Makefile.ag
--- a/clients/odbc/winsetup/Makefile.ag
+++ b/clients/odbc/winsetup/Makefile.ag
@@ -7,6 +7,7 @@
INCLUDES = \
../include \
../driver \
+ ../../../common/utils \
-I$(MONETDB_INCLUDEDIR) \
$(ODBC_INCS)
@@ -15,12 +16,12 @@ ODBCLIBS = -lodbc32 -lodbccp32 -lversion
lib_MonetODBCs = {
SOURCES = setup.c setup.rc setup.syms resource.h
- LIBS = -lodbccp32 -luser32 $(LEGACY_STDIO_DEFINITIONS)
+ LIBS = ../../../common/utils/libmutils -lodbccp32 -luser32
$(LEGACY_STDIO_DEFINITIONS)
}
bin_odbcinstall = {
SOURCES = install.c
- LIBS = -lodbc32 -lodbccp32 -lversion -lshlwapi -luser32
$(LEGACY_STDIO_DEFINITIONS)
+ LIBS = ../../../common/utils/libmutils -lodbc32 -lodbccp32 -lversion
-lshlwapi -luser32 $(LEGACY_STDIO_DEFINITIONS)
}
EXTRA_DIST = banner.bmp
diff --git a/common/utils/mutils.c b/common/utils/mutils.c
--- a/common/utils/mutils.c
+++ b/common/utils/mutils.c
@@ -13,6 +13,7 @@
#include <unistd.h>
#include <string.h>
#include "mutils.h"
+#include "mstring.h"
#if defined(HAVE_EXECINFO_H) && defined(HAVE_BACKTRACE)
#include <execinfo.h>
diff --git a/gdk/gdk_system.c b/gdk/gdk_system.c
--- a/gdk/gdk_system.c
+++ b/gdk/gdk_system.c
@@ -29,6 +29,7 @@
* @- Mthreads Routine implementations
*/
#include "monetdb_config.h"
+#include "mstring.h"
#include "gdk_system.h"
#include "gdk_system_private.h"
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
