MonetDB: default - Merge with Oct2014 branch.

[Sjoerd Mullender]

Changeset: 399e976dc063 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=399e976dc063
Modified Files:
        clients/odbc/driver/ODBCUtil.c
Branch: default
Log Message:

Merge with Oct2014 branch.


diffs (48 lines):

diff --git a/clients/odbc/driver/ODBCUtil.c b/clients/odbc/driver/ODBCUtil.c
--- a/clients/odbc/driver/ODBCUtil.c
+++ b/clients/odbc/driver/ODBCUtil.c
@@ -1207,7 +1207,7 @@ translateFetchOrientation(SQLUSMALLINT F
        case SQL_FETCH_BOOKMARK:
                return "SQL_FETCH_BOOKMARK";
        default:
-               snprintf(unknown, sizeof(unknown), "unknown (%u)", 
FetchOrientation);
+               snprintf(unknown, sizeof(unknown), "unknown (%u)", (unsigned 
int) FetchOrientation);
                return unknown;
        }
 }
@@ -1277,7 +1277,7 @@ translateConnectAttribute(SQLINTEGER Att
        case SQL_ATTR_TXN_ISOLATION:
                return "SQL_ATTR_TXN_ISOLATION";
        default:
-               snprintf(unknown, sizeof(unknown), "unknown (%d)", Attribute);
+               snprintf(unknown, sizeof(unknown), "unknown (%d)", (int) 
Attribute);
                return unknown;
        }
 }
@@ -1328,7 +1328,7 @@ translateEnvAttribute(SQLINTEGER Attribu
        case SQL_ATTR_CP_MATCH:
                return "SQL_ATTR_CP_MATCH";
        default:
-               snprintf(unknown, sizeof(unknown), "unknown (%d)", Attribute);
+               snprintf(unknown, sizeof(unknown), "unknown (%d)", (int) 
Attribute);
                return unknown;
        }
 }
@@ -1406,7 +1406,7 @@ translateStmtAttribute(SQLINTEGER Attrib
        case SQL_ATTR_USE_BOOKMARKS:
                return "SQL_ATTR_USE_BOOKMARKS";
        default:
-               snprintf(unknown, sizeof(unknown), "unknown (%d)", Attribute);
+               snprintf(unknown, sizeof(unknown), "unknown (%d)", (int) 
Attribute);
                return unknown;
        }
 }
@@ -1444,7 +1444,7 @@ translateStmtOption(SQLUSMALLINT Option)
        case SQL_ROW_NUMBER:
                return "SQL_ROW_NUMBER";
        default:
-               snprintf(unknown, sizeof(unknown), "unknown (%u)", Option);
+               snprintf(unknown, sizeof(unknown), "unknown (%u)", (unsigned 
int) Option);
                return unknown;
        }
 }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list