Date: Wednesday, January 18, 2006 @ 13:06:10
Author: csaba
Path: /cvsroot/carob/libmysequoia/src
Modified: CarobStmt.cpp (1.11 -> 1.12) Utils.cpp (1.21 -> 1.22)
s/long long/int64_t
---------------+
CarobStmt.cpp | 6 +++---
Utils.cpp | 53 +++++++++++++++++++++++++++--------------------------
2 files changed, 30 insertions(+), 29 deletions(-)
Index: libmysequoia/src/CarobStmt.cpp
diff -u libmysequoia/src/CarobStmt.cpp:1.11 libmysequoia/src/CarobStmt.cpp:1.12
--- libmysequoia/src/CarobStmt.cpp:1.11 Tue Jan 17 09:38:38 2006
+++ libmysequoia/src/CarobStmt.cpp Wed Jan 18 13:06:10 2006
@@ -242,7 +242,7 @@
c_stmt->setInt(no, *(int *)p->buffer);
break;
case MYSQL_TYPE_LONGLONG:
- c_stmt->setLong(no, *(long long *)p->buffer);
+ c_stmt->setLong(no, *(int64_t *)p->buffer);
break;
case MYSQL_TYPE_FLOAT:
c_stmt->setFloat(no, *(float *)p->buffer);
@@ -647,7 +647,7 @@
result = new int(liveResultSet->getInt32(colNo));
break;
case MYSQL_TYPE_LONGLONG:
-// result = new(long long(liveResultSet->getInt64(colNo)));
+// result = new(int64_t(liveResultSet->getInt64(colNo)));
break;
case MYSQL_TYPE_FLOAT:
// result = new(float(liveResultSet->getFloat(colNo)));
@@ -703,7 +703,7 @@
delete (int *)buffer;
break;
case MYSQL_TYPE_LONGLONG:
- delete (long long *)buffer;
+ delete (int64_t *)buffer;
break;
case MYSQL_TYPE_FLOAT:
delete (float *)buffer;
Index: libmysequoia/src/Utils.cpp
diff -u libmysequoia/src/Utils.cpp:1.21 libmysequoia/src/Utils.cpp:1.22
--- libmysequoia/src/Utils.cpp:1.21 Wed Jan 18 12:30:02 2006
+++ libmysequoia/src/Utils.cpp Wed Jan 18 13:06:10 2006
@@ -30,6 +30,7 @@
#include <errmsg.h>
#include <mysqld_error.h>
+#include <cstdio>
#include <climits>
#include <cmath>
#include <ctime>
@@ -316,7 +317,7 @@
* return true if the value is not in the range (min, max)
* or (0, umax) for unsigned
*/
-inline bool isTruncated(long long int value, long long int min, long long int
max, long long int umax, bool is_unsigned)
+inline bool isTruncated(int64_t value, int64_t min, int64_t max, int64_t umax,
bool is_unsigned)
{
return is_unsigned ? (value > umax) || (value < 0) : (value > max) || (value
< min);
}
@@ -343,7 +344,7 @@
break;
case MYSQL_TYPE_LONGLONG:
- *(unsigned long long int *)bind->buffer = is_unsigned ? *(unsigned char
*)data : *(char *)data;
+ *(uint64_t *)bind->buffer = is_unsigned ? *(unsigned char *)data :
*(char *)data;
break;
case MYSQL_TYPE_FLOAT:
@@ -403,7 +404,7 @@
break;
case MYSQL_TYPE_LONGLONG:
- *(unsigned long long int *)bind->buffer = is_unsigned ? *(unsigned short
int *)data : *(short int *)data;
+ *(uint64_t *)bind->buffer = is_unsigned ? *(unsigned short int *)data :
*(short int *)data;
break;
case MYSQL_TYPE_FLOAT:
@@ -464,7 +465,7 @@
break;
case MYSQL_TYPE_LONGLONG:
- *(unsigned long long int *)bind->buffer = is_unsigned ? *(unsigned int
*)data : *(int *)data;
+ *(uint64_t *)bind->buffer = is_unsigned ? *(unsigned int *)data : *(int
*)data;
break;
case MYSQL_TYPE_FLOAT:
@@ -510,33 +511,33 @@
switch (bind->buffer_type)
{
case MYSQL_TYPE_TINY:
- *(unsigned char*)bind->buffer = is_unsigned ? *(unsigned long long int
*)data : *(long long int *)data;
- *bind->error = isTruncated(*(long long int *)data, SCHAR_MIN, SCHAR_MAX,
UCHAR_MAX, is_unsigned);
+ *(unsigned char*)bind->buffer = is_unsigned ? *(uint64_t *)data :
*(int64_t *)data;
+ *bind->error = isTruncated(*(int64_t *)data, SCHAR_MIN, SCHAR_MAX,
UCHAR_MAX, is_unsigned);
break;
case MYSQL_TYPE_SHORT:
- *(unsigned short int*)bind->buffer = is_unsigned ? *(unsigned long long
int *)data : *(long long int *)data;
- *bind->error = isTruncated(*(long long int *)data, SHRT_MIN, SHRT_MAX,
USHRT_MAX, is_unsigned);
+ *(unsigned short int*)bind->buffer = is_unsigned ? *(uint64_t *)data :
*(int64_t *)data;
+ *bind->error = isTruncated(*(int64_t *)data, SHRT_MIN, SHRT_MAX,
USHRT_MAX, is_unsigned);
break;
case MYSQL_TYPE_LONG:
- *(unsigned int*)bind->buffer = is_unsigned ? *(unsigned long long int
*)data : *(long long int *)data;
- *bind->error = isTruncated(*(long long int *)data, INT_MIN, INT_MAX,
UINT_MAX, is_unsigned);
+ *(unsigned int*)bind->buffer = is_unsigned ? *(uint64_t *)data :
*(int64_t *)data;
+ *bind->error = isTruncated(*(int64_t *)data, INT_MIN, INT_MAX, UINT_MAX,
is_unsigned);
break;
case MYSQL_TYPE_LONGLONG:
- *(unsigned long long int *)bind->buffer = is_unsigned ? *(unsigned long
long int *)data : *(long long int *)data;
- *bind->error = bind->is_unsigned != is_unsigned && *(unsigned long long
int *)data > LONG_MAX;
+ *(uint64_t *)bind->buffer = is_unsigned ? *(uint64_t *)data : *(int64_t
*)data;
+ *bind->error = bind->is_unsigned != is_unsigned && *(uint64_t *)data >
LONG_MAX;
break;
case MYSQL_TYPE_FLOAT:
// TODO check overflow
- *(float *)bind->buffer = is_unsigned ? *(unsigned long long int *)data :
*(long long int *)data;
+ *(float *)bind->buffer = is_unsigned ? *(uint64_t *)data : *(int64_t
*)data;
break;
case MYSQL_TYPE_DOUBLE:
// TODO check overflow
- *(double *)bind->buffer = is_unsigned ? *(unsigned long long int *)data
: *(long long int *)data;
+ *(double *)bind->buffer = is_unsigned ? *(uint64_t *)data : *(int64_t
*)data;
break;
case MYSQL_TYPE_DECIMAL:
@@ -547,7 +548,7 @@
case MYSQL_TYPE_BLOB:
case MYSQL_TYPE_VAR_STRING:
case MYSQL_TYPE_STRING:
- int len = snprintf((char *)bind->buffer, bind->buffer_length, "%lld",
is_unsigned ? *(unsigned long long int *)data : *(long long int *)data);
+ int len = snprintf((char *)bind->buffer, bind->buffer_length, "%lld",
is_unsigned ? *(uint64_t *)data : *(int64_t *)data);
*bind->error = (len < 0) || ((unsigned int)len >= bind->buffer_length);
break;
@@ -590,8 +591,8 @@
break;
case MYSQL_TYPE_LONGLONG:
- *(unsigned long long int*)bind->buffer = bind->is_unsigned ? (unsigned
long long int)f : (long long int)f;
- *bind->error = ff != (bind->is_unsigned ? (float) ((unsigned long long
int)f) : (float) ((long long int)f));
+ *(uint64_t*)bind->buffer = bind->is_unsigned ? (uint64_t)f : (int64_t)f;
+ *bind->error = ff != (bind->is_unsigned ? (float) ((uint64_t)f) :
(float) ((int64_t)f));
break;
case MYSQL_TYPE_FLOAT:
@@ -654,8 +655,8 @@
break;
case MYSQL_TYPE_LONGLONG:
- *(unsigned long long int*)bind->buffer = bind->is_unsigned ? (unsigned
long long int)d : (long long int)d;
- *bind->error = df != (bind->is_unsigned ? (double) ((unsigned long long
int)d) : (double) ((long long int)d));
+ *(uint64_t*)bind->buffer = bind->is_unsigned ? (uint64_t)d : (int64_t)d;
+ *bind->error = df != (bind->is_unsigned ? (double) ((uint64_t)d) :
(double) ((int64_t)d));
break;
case MYSQL_TYPE_FLOAT:
@@ -697,7 +698,7 @@
{
string *s = (string *)data;
size_t s_length = s->length();
- long long int v;
+ int64_t v;
float f;
double d;
@@ -706,7 +707,7 @@
switch (bind->buffer_type)
{
case MYSQL_TYPE_TINY:
- if (convert<long long int, string>(v, *s))
+ if (convert<int64_t, string>(v, *s))
{
*(unsigned char *)bind->buffer = (char)v;
*bind->error = isTruncated(v, SCHAR_MIN, SCHAR_MAX, UCHAR_MAX,
bind->is_unsigned);
@@ -716,7 +717,7 @@
break;
case MYSQL_TYPE_SHORT:
- if (convert<long long int, string>(v, *s))
+ if (convert<int64_t, string>(v, *s))
{
*(unsigned short int *)bind->buffer = (short int)v;
*bind->error = isTruncated(v, SHRT_MIN, SHRT_MAX, USHRT_MAX,
bind->is_unsigned);
@@ -726,7 +727,7 @@
break;
case MYSQL_TYPE_LONG:
- if (convert<long long int, string>(v, *s))
+ if (convert<int64_t, string>(v, *s))
{
*(unsigned int *)bind->buffer = (int)v;
*bind->error = isTruncated(v, INT_MIN, INT_MAX, UINT_MAX,
bind->is_unsigned);
@@ -736,9 +737,9 @@
break;
case MYSQL_TYPE_LONGLONG:
- if (convert<long long int, string>(v, *s))
+ if (convert<int64_t, string>(v, *s))
{
- *(unsigned long long int *)bind->buffer = (long long int)v;
+ *(uint64_t *)bind->buffer = (int64_t)v;
*bind->error = bind->is_unsigned && v < 0;
}
else
@@ -767,7 +768,7 @@
case MYSQL_TYPE_BLOB:
case MYSQL_TYPE_VAR_STRING:
case MYSQL_TYPE_STRING:
- size_t length = min((size_t)max((long long)s_length - bind->offset,
(long long)0), (size_t)bind->buffer_length);
+ size_t length = min((size_t)max((int64_t)s_length - bind->offset,
(int64_t)0), (size_t)bind->buffer_length);
if (length)
memcpy(bind->buffer, s->data()+bind->offset, length);
if (length < bind->buffer_length)
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
