Changeset: a73b7df8037f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a73b7df8037f
Modified Files:
clients/odbc/driver/ODBCUtil.c
clients/odbc/driver/SQLGetDescField.c
clients/odbc/driver/SQLGetDiagField.c
clients/odbc/driver/SQLGetEnvAttr.c
clients/odbc/driver/SQLGetInfo.c
clients/odbc/driver/SQLGetStmtAttr.c
Branch: Oct2014
Log Message:
Add int casts.
diffs (173 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
@@ -1011,7 +1011,8 @@ translateCType(SQLSMALLINT ValueType)
case SQL_INTERVAL:
return "SQL_INTERVAL";
default:
- snprintf(unknown, sizeof(unknown), "unknown (%d)", ValueType);
+ snprintf(unknown, sizeof(unknown), "unknown (%d)",
+ (int) ValueType);
return unknown;
}
}
@@ -1097,7 +1098,8 @@ translateSQLType(SQLSMALLINT ParameterTy
case SQL_INTERVAL:
return "SQL_INTERVAL";
default:
- snprintf(unknown, sizeof(unknown), "unknown (%d)",
ParameterType);
+ snprintf(unknown, sizeof(unknown), "unknown (%d)",
+ (int) ParameterType);
return unknown;
}
}
@@ -1183,7 +1185,8 @@ translateFieldIdentifier(SQLSMALLINT Fie
case SQL_DESC_UPDATABLE:
return "SQL_DESC_UPDATABLE";
default:
- snprintf(unknown, sizeof(unknown), "unknown (%d)",
FieldIdentifier);
+ snprintf(unknown, sizeof(unknown), "unknown (%d)",
+ (int) FieldIdentifier);
return unknown;
}
}
@@ -1277,7 +1280,8 @@ translateConnectAttribute(SQLINTEGER Att
case SQL_ATTR_TXN_ISOLATION:
return "SQL_ATTR_TXN_ISOLATION";
default:
- snprintf(unknown, sizeof(unknown), "unknown (%d)", (int)
Attribute);
+ snprintf(unknown, sizeof(unknown), "unknown (%d)",
+ (int) Attribute);
return unknown;
}
}
@@ -1328,7 +1332,8 @@ translateEnvAttribute(SQLINTEGER Attribu
case SQL_ATTR_CP_MATCH:
return "SQL_ATTR_CP_MATCH";
default:
- snprintf(unknown, sizeof(unknown), "unknown (%d)", (int)
Attribute);
+ snprintf(unknown, sizeof(unknown), "unknown (%d)",
+ (int) Attribute);
return unknown;
}
}
@@ -1406,7 +1411,8 @@ translateStmtAttribute(SQLINTEGER Attrib
case SQL_ATTR_USE_BOOKMARKS:
return "SQL_ATTR_USE_BOOKMARKS";
default:
- snprintf(unknown, sizeof(unknown), "unknown (%d)", (int)
Attribute);
+ snprintf(unknown, sizeof(unknown), "unknown (%d)",
+ (int) Attribute);
return unknown;
}
}
@@ -1458,7 +1464,8 @@ translateCompletionType(SQLSMALLINT Comp
case SQL_ROLLBACK:
return "SQL_ROLLBACK";
default:
- snprintf(unknown, sizeof(unknown), "unknown (%d)",
CompletionType);
+ snprintf(unknown, sizeof(unknown), "unknown (%d)",
+ (int) CompletionType);
return unknown;
}
}
diff --git a/clients/odbc/driver/SQLGetDescField.c
b/clients/odbc/driver/SQLGetDescField.c
--- a/clients/odbc/driver/SQLGetDescField.c
+++ b/clients/odbc/driver/SQLGetDescField.c
@@ -291,7 +291,8 @@ SQLGetDescField(SQLHDESC DescriptorHandl
ODBCLOG("SQLGetDescField " PTRFMT " %d %s " PTRFMT " %d " PTRFMT "\n",
PTRFMTCAST DescriptorHandle, (int) RecordNumber,
translateFieldIdentifier(FieldIdentifier),
- PTRFMTCAST ValuePtr, BufferLength, PTRFMTCAST StringLengthPtr);
+ PTRFMTCAST ValuePtr, (int) BufferLength,
+ PTRFMTCAST StringLengthPtr);
#endif
if (!isValidDesc((ODBCDesc *) DescriptorHandle))
@@ -339,7 +340,8 @@ SQLGetDescFieldW(SQLHDESC DescriptorHand
ODBCLOG("SQLGetDescFieldW " PTRFMT " %d %s " PTRFMT " %d " PTRFMT "\n",
PTRFMTCAST DescriptorHandle, (int) RecordNumber,
translateFieldIdentifier(FieldIdentifier),
- PTRFMTCAST ValuePtr, BufferLength, PTRFMTCAST StringLengthPtr);
+ PTRFMTCAST ValuePtr, (int) BufferLength,
+ PTRFMTCAST StringLengthPtr);
#endif
if (!isValidDesc(desc))
diff --git a/clients/odbc/driver/SQLGetDiagField.c
b/clients/odbc/driver/SQLGetDiagField.c
--- a/clients/odbc/driver/SQLGetDiagField.c
+++ b/clients/odbc/driver/SQLGetDiagField.c
@@ -243,7 +243,8 @@ translateDiagIdentifier(SQLSMALLINT Diag
case SQL_DIAG_SUBCLASS_ORIGIN:
return "SQL_DIAG_SUBCLASS_ORIGIN";
default:
- snprintf(unknown, sizeof(unknown), "unknown (%d)",
DiagIdentifier);
+ snprintf(unknown, sizeof(unknown), "unknown (%d)",
+ (int) DiagIdentifier);
return unknown;
}
}
@@ -313,7 +314,7 @@ SQLGetDiagFieldW(SQLSMALLINT HandleType,
PTRFMTCAST Handle, (int) RecNumber,
translateDiagIdentifier(DiagIdentifier),
PTRFMTCAST DiagInfoPtr,
- BufferLength, PTRFMTCAST StringLengthPtr);
+ (int) BufferLength, PTRFMTCAST StringLengthPtr);
#endif
switch (DiagIdentifier) {
diff --git a/clients/odbc/driver/SQLGetEnvAttr.c
b/clients/odbc/driver/SQLGetEnvAttr.c
--- a/clients/odbc/driver/SQLGetEnvAttr.c
+++ b/clients/odbc/driver/SQLGetEnvAttr.c
@@ -55,7 +55,8 @@ SQLGetEnvAttr(SQLHENV EnvironmentHandle,
ODBCLOG("SQLGetEnvAttr " PTRFMT " %s " PTRFMT " %d " PTRFMT "\n",
PTRFMTCAST EnvironmentHandle,
translateEnvAttribute(Attribute),
- PTRFMTCAST ValuePtr, BufferLength, PTRFMTCAST StringLengthPtr);
+ PTRFMTCAST ValuePtr, (int) BufferLength,
+ PTRFMTCAST StringLengthPtr);
#endif
(void) BufferLength; /* Stefan: unused!? */
diff --git a/clients/odbc/driver/SQLGetInfo.c b/clients/odbc/driver/SQLGetInfo.c
--- a/clients/odbc/driver/SQLGetInfo.c
+++ b/clients/odbc/driver/SQLGetInfo.c
@@ -1576,7 +1576,7 @@ SQLGetInfo(SQLHDBC ConnectionHandle,
#ifdef ODBCDEBUG
ODBCLOG("SQLGetInfo " PTRFMT " %s " PTRFMT " %d " PTRFMT "\n",
PTRFMTCAST ConnectionHandle, translateInfoType(InfoType),
- PTRFMTCAST InfoValuePtr, BufferLength,
+ PTRFMTCAST InfoValuePtr, (int) BufferLength,
PTRFMTCAST StringLengthPtr);
#endif
@@ -1621,7 +1621,7 @@ SQLGetInfoW(SQLHDBC ConnectionHandle,
#ifdef ODBCDEBUG
ODBCLOG("SQLGetInfoW " PTRFMT " %s " PTRFMT " %d " PTRFMT "\n",
PTRFMTCAST ConnectionHandle, translateInfoType(InfoType),
- PTRFMTCAST InfoValuePtr, BufferLength,
+ PTRFMTCAST InfoValuePtr, (int) BufferLength,
PTRFMTCAST StringLengthPtr);
#endif
diff --git a/clients/odbc/driver/SQLGetStmtAttr.c
b/clients/odbc/driver/SQLGetStmtAttr.c
--- a/clients/odbc/driver/SQLGetStmtAttr.c
+++ b/clients/odbc/driver/SQLGetStmtAttr.c
@@ -197,7 +197,7 @@ SQLGetStmtAttr(SQLHSTMT StatementHandle,
#ifdef ODBCDEBUG
ODBCLOG("SQLGetStmtAttr " PTRFMT " %s " PTRFMT " %d " PTRFMT "\n",
PTRFMTCAST StatementHandle, translateStmtAttribute(Attribute),
- PTRFMTCAST ValuePtr, BufferLength,
+ PTRFMTCAST ValuePtr, (int) BufferLength,
PTRFMTCAST StringLengthPtr);
#endif
@@ -237,7 +237,7 @@ SQLGetStmtAttrW(SQLHSTMT StatementHandle
#ifdef ODBCDEBUG
ODBCLOG("SQLGetStmtAttrW " PTRFMT " %s " PTRFMT " %d " PTRFMT "\n",
PTRFMTCAST StatementHandle, translateStmtAttribute(Attribute),
- PTRFMTCAST ValuePtr, BufferLength,
+ PTRFMTCAST ValuePtr, (int) BufferLength,
PTRFMTCAST StringLengthPtr);
#endif
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
