Date: Thursday, January 12, 2006 @ 17:04:47
Author: csaba
Path: /cvsroot/carob/libmysequoia/src
Modified: Utils.cpp (1.13 -> 1.14)
Compacted a few if statement to x ? y : z
-----------+
Utils.cpp | 50 ++++++++++----------------------------------------
1 files changed, 10 insertions(+), 40 deletions(-)
Index: libmysequoia/src/Utils.cpp
diff -u libmysequoia/src/Utils.cpp:1.13 libmysequoia/src/Utils.cpp:1.14
--- libmysequoia/src/Utils.cpp:1.13 Thu Jan 12 16:21:22 2006
+++ libmysequoia/src/Utils.cpp Thu Jan 12 17:04:47 2006
@@ -248,32 +248,20 @@
switch (bind->buffer_type)
{
case MYSQL_TYPE_TINY:
- if (is_unsigned)
- *(unsigned char *)bind->buffer = *(unsigned char *)data;
- else
- *(char *)bind->buffer = *(char *)data;
+ *(unsigned char *)bind->buffer = is_unsigned ? *(unsigned char *)data :
*(char *)data;
*bind->error = *bind->error && *(unsigned char *)data > SCHAR_MAX;
break;
case MYSQL_TYPE_SHORT:
- if (is_unsigned)
- *(unsigned short int *)bind->buffer = *(unsigned char *)data;
- else
- *(short int *)bind->buffer = *(char *)data;
+ *(unsigned short int *)bind->buffer = is_unsigned ? *(unsigned char
*)data : *(char *)data;
break;
case MYSQL_TYPE_LONG:
- if (is_unsigned)
- *(unsigned int *)bind->buffer = *(unsigned char *)data;
- else
- *(int *)bind->buffer = *(char *)data;
+ *(unsigned int *)bind->buffer = is_unsigned ? *(unsigned char *)data :
*(char *)data;
break;
case MYSQL_TYPE_LONGLONG:
- if (is_unsigned)
- *(unsigned long long int *)bind->buffer = *(unsigned char *)data;
- else
- *(long long int *)bind->buffer = *(char *)data;
+ *(unsigned long long int *)bind->buffer = is_unsigned ? *(unsigned char
*)data : *(char *)data;
break;
case MYSQL_TYPE_FLOAT:
@@ -313,25 +301,16 @@
break;
case MYSQL_TYPE_SHORT:
- if (is_unsigned)
- *(unsigned short int *)bind->buffer = *(unsigned short int *)data;
- else
- *(short int *)bind->buffer = *(short int *)data;
+ *(unsigned short int *)bind->buffer = is_unsigned ? *(unsigned short int
*)data : *(short int *)data;
*bind->error = *bind->error && *(unsigned short int *)data > SHRT_MAX;
break;
case MYSQL_TYPE_LONG:
- if (is_unsigned)
- *(unsigned int *)bind->buffer = *(unsigned short int *)data;
- else
- *(int *)bind->buffer = *(short int *)data;
+ *(unsigned int *)bind->buffer = is_unsigned ? *(unsigned short int
*)data : *(short int *)data;
break;
case MYSQL_TYPE_LONGLONG:
- if (is_unsigned)
- *(unsigned long long int *)bind->buffer = *(unsigned short int *)data;
- else
- *(long long int *)bind->buffer = *(short int *)data;
+ *(unsigned long long int *)bind->buffer = is_unsigned ? *(unsigned short
int *)data : *(short int *)data;
break;
case MYSQL_TYPE_FLOAT:
@@ -374,18 +353,12 @@
break;
case MYSQL_TYPE_LONG:
- if (is_unsigned)
- *(unsigned int *)bind->buffer = *(unsigned int *)data;
- else
- *(int *)bind->buffer = *(int *)data;
+ *(unsigned int *)bind->buffer = is_unsigned ? *(unsigned int *)data :
*(int *)data;
*bind->error = *bind->error && *(unsigned int *)data > INT_MAX;
break;
case MYSQL_TYPE_LONGLONG:
- if (is_unsigned)
- *(unsigned long long int *)bind->buffer = *(unsigned int *)data;
- else
- *(long long int *)bind->buffer = *(int *)data;
+ *(unsigned long long int *)bind->buffer = is_unsigned ? *(unsigned int
*)data : *(int *)data;
break;
case MYSQL_TYPE_FLOAT:
@@ -431,10 +404,7 @@
break;
case MYSQL_TYPE_LONGLONG:
- if (is_unsigned)
- *(unsigned long long int *)bind->buffer = *(unsigned long long int
*)data;
- else
- *(long long int *)bind->buffer = *(long long int *)data;
+ *(unsigned long long int *)bind->buffer = is_unsigned ? *(unsigned long
long int *)data : *(long long int *)data;
*bind->error = *bind->error && *(unsigned long long int *)data >
LONG_MAX;
break;
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
