Modified:
trunk/driver/catalog.c
trunk/driver/execute.c
trunk/driver/info.c
trunk/driver/myutil.h
Log:
Remove some #ifdef blocks by defining a wrapper for int2str(), which has
changed definitions.
Modified: trunk/driver/catalog.c
===================================================================
--- trunk/driver/catalog.c 2007-07-16 19:08:36 UTC (rev 584)
+++ trunk/driver/catalog.c 2007-07-16 19:15:56 UTC (rev 585)
@@ -1117,11 +1117,7 @@
return rc;
}
pthread_mutex_unlock(&dbc->lock);
-#if MYSQL_VERSION_ID >= 40100
- int2str(SQL_INDEX_OTHER,SS_type,10,0);
-#else
- int2str(SQL_INDEX_OTHER,SS_type,10);
-#endif
+ my_int2str(SQL_INDEX_OTHER,SS_type,10,0);
stmt->order= SQLSTAT_order;
stmt->order_count= array_elements(SQLSTAT_order);
stmt->fix_fields= fix_fields_copy;
Modified: trunk/driver/execute.c
===================================================================
--- trunk/driver/execute.c 2007-07-16 19:08:36 UTC (rev 584)
+++ trunk/driver/execute.c 2007-07-16 19:15:56 UTC (rev 585)
@@ -339,53 +339,29 @@
case SQL_C_BIT:
case SQL_C_TINYINT:
case SQL_C_STINYINT:
-#if MYSQL_VERSION_ID >= 40100
- length= int2str((long) *((signed char*) data),buff,-10,0) -buff;
-#else
- length= int2str((long) *((signed char*) data),buff,-10) -buff;
-#endif
+ length= my_int2str((long)*((signed char *)data),buff,-10,0) -buff;
data= buff;
break;
case SQL_C_UTINYINT:
-#if MYSQL_VERSION_ID >= 40100
- length= int2str((long) *((unsigned char*) data),buff,-10,0) -buff;
-#else
- length= int2str((long) *((unsigned char*) data),buff,-10) -buff;
-#endif
+ length= my_int2str((long)*((unsigned char *)data),buff,-10,0) -buff;
data= buff;
break;
case SQL_C_SHORT:
case SQL_C_SSHORT:
-#if MYSQL_VERSION_ID >= 40100
- length= int2str((long) *((short int*) data),buff,-10,0) -buff;
-#else
- length= int2str((long) *((short int*) data),buff,-10) -buff;
-#endif
+ length= my_int2str((long)*((short int *)data),buff,-10,0) -buff;
data= buff;
break;
case SQL_C_USHORT:
-#if MYSQL_VERSION_ID >= 40100
- length= int2str((long) *((unsigned short int*) data),buff,-10,0) -buff;
-#else
- length= int2str((long) *((unsigned short int*) data),buff,-10) -buff;
-#endif
+ length= my_int2str((long)*((unsigned short int *)data),buff,-10,0) -buff;
data= buff;
break;
case SQL_C_LONG:
case SQL_C_SLONG:
-#if MYSQL_VERSION_ID >= 40100
- length= int2str(*((SQLINTEGER*) data),buff,-10,0) -buff;
-#else
- length= int2str(*((SQLINTEGER*) data),buff,-10) -buff;
-#endif
+ length= my_int2str(*((SQLINTEGER*) data),buff,-10,0) -buff;
data= buff;
break;
case SQL_C_ULONG:
-#if MYSQL_VERSION_ID >= 40100
- length= int2str(*((SQLUINTEGER*) data),buff,10,0) -buff;
-#else
- length= int2str(*((SQLUINTEGER*) data),buff,10) -buff;
-#endif
+ length= my_int2str(*((SQLUINTEGER*) data),buff,10,0) -buff;
data= buff;
break;
case SQL_C_SBIGINT:
Modified: trunk/driver/info.c
===================================================================
--- trunk/driver/info.c 2007-07-16 19:08:36 UTC (rev 584)
+++ trunk/driver/info.c 2007-07-16 19:15:56 UTC (rev 585)
@@ -1093,63 +1093,33 @@
*/
void init_getfunctions(void)
{
-#if MYSQL_VERSION_ID >= 40100
- int2str(SQL_SEARCHABLE,sql_searchable,-10,0);
- int2str(SQL_UNSEARCHABLE,sql_unsearchable,-10,0);
- int2str(SQL_NULLABLE,sql_nullable,-10,0);
- int2str(SQL_NO_NULLS,sql_no_nulls,-10,0);
- int2str(SQL_BIT,sql_bit,-10,0);
- int2str(SQL_TINYINT,sql_tinyint,-10,0);
- int2str(SQL_SMALLINT,sql_smallint,-10,0);
- int2str(SQL_INTEGER,sql_integer,-10,0);
- int2str(SQL_BIGINT,sql_bigint,-10,0);
- int2str(SQL_DECIMAL,sql_decimal,-10,0);
- int2str(SQL_NUMERIC,sql_numeric,-10,0);
- int2str(SQL_REAL,sql_real,-10,0);
- int2str(SQL_FLOAT,sql_float,-10,0);
- int2str(SQL_DOUBLE,sql_double,-10,0);
- int2str(SQL_CHAR,sql_char,-10,0);
- int2str(SQL_VARCHAR,sql_varchar,-10,0);
- int2str(SQL_LONGVARCHAR,sql_longvarchar,-10,0);
- int2str(SQL_LONGVARBINARY,sql_longvarbinary,-10,0);
- int2str(SQL_VARBINARY,sql_varbinary,-10,0);
- int2str(SQL_BINARY,sql_binary,-10,0);
- int2str(SQL_TYPE_TIMESTAMP,sql_timestamp,-10,0);
- int2str(SQL_TYPE_DATE,sql_date,-10,0);
- int2str(SQL_TYPE_TIME,sql_time,-10,0);
+ my_int2str(SQL_SEARCHABLE,sql_searchable,-10,0);
+ my_int2str(SQL_UNSEARCHABLE,sql_unsearchable,-10,0);
+ my_int2str(SQL_NULLABLE,sql_nullable,-10,0);
+ my_int2str(SQL_NO_NULLS,sql_no_nulls,-10,0);
+ my_int2str(SQL_BIT,sql_bit,-10,0);
+ my_int2str(SQL_TINYINT,sql_tinyint,-10,0);
+ my_int2str(SQL_SMALLINT,sql_smallint,-10,0);
+ my_int2str(SQL_INTEGER,sql_integer,-10,0);
+ my_int2str(SQL_BIGINT,sql_bigint,-10,0);
+ my_int2str(SQL_DECIMAL,sql_decimal,-10,0);
+ my_int2str(SQL_NUMERIC,sql_numeric,-10,0);
+ my_int2str(SQL_REAL,sql_real,-10,0);
+ my_int2str(SQL_FLOAT,sql_float,-10,0);
+ my_int2str(SQL_DOUBLE,sql_double,-10,0);
+ my_int2str(SQL_CHAR,sql_char,-10,0);
+ my_int2str(SQL_VARCHAR,sql_varchar,-10,0);
+ my_int2str(SQL_LONGVARCHAR,sql_longvarchar,-10,0);
+ my_int2str(SQL_LONGVARBINARY,sql_longvarbinary,-10,0);
+ my_int2str(SQL_VARBINARY,sql_varbinary,-10,0);
+ my_int2str(SQL_BINARY,sql_binary,-10,0);
+ my_int2str(SQL_TYPE_TIMESTAMP,sql_timestamp,-10,0);
+ my_int2str(SQL_TYPE_DATE,sql_date,-10,0);
+ my_int2str(SQL_TYPE_TIME,sql_time,-10,0);
# if (ODBCVER < 0x0300)
myodbc_sqlstate2_init();
myodbc_ov2_inited= 1;
# endif
-#else
- int2str(SQL_SEARCHABLE,sql_searchable,-10);
- int2str(SQL_UNSEARCHABLE,sql_unsearchable,-10);
- int2str(SQL_NULLABLE,sql_nullable,-10);
- int2str(SQL_NO_NULLS,sql_no_nulls,-10);
- int2str(SQL_BIT,sql_bit,-10);
- int2str(SQL_TINYINT,sql_tinyint,-10);
- int2str(SQL_SMALLINT,sql_smallint,-10);
- int2str(SQL_INTEGER,sql_integer,-10);
- int2str(SQL_BIGINT,sql_bigint,-10);
- int2str(SQL_DECIMAL,sql_decimal,-10);
- int2str(SQL_NUMERIC,sql_numeric,-10);
- int2str(SQL_REAL,sql_real,-10);
- int2str(SQL_FLOAT,sql_float,-10);
- int2str(SQL_DOUBLE,sql_double,-10);
- int2str(SQL_CHAR,sql_char,-10);
- int2str(SQL_VARCHAR,sql_varchar,-10);
- int2str(SQL_LONGVARCHAR,sql_longvarchar,-10);
- int2str(SQL_LONGVARBINARY,sql_longvarbinary,-10);
- int2str(SQL_VARBINARY,sql_varbinary,-10);
- int2str(SQL_BINARY,sql_binary,-10);
- int2str(SQL_TYPE_TIMESTAMP,sql_timestamp,-10);
- int2str(SQL_TYPE_DATE,sql_date,-10);
- int2str(SQL_TYPE_TIME,sql_time,-10);
-# if (ODBCVER < 0x0300)
- myodbc_sqlstate2_init();
- myodbc_ov2_inited= 1;
-# endif
-#endif
}
/**
@@ -1159,15 +1129,9 @@
{
if (odbc_version == SQL_OV_ODBC2)
{
-#if MYSQL_VERSION_ID >= 40100
- int2str(SQL_TIMESTAMP,sql_timestamp,-10,0);
- int2str(SQL_DATE,sql_date,-10,0);
- int2str(SQL_TIME,sql_time,-10,0);
-#else
- int2str(SQL_TIMESTAMP,sql_timestamp,-10);
- int2str(SQL_DATE,sql_date,-10);
- int2str(SQL_TIME,sql_time,-10);
-#endif
+ my_int2str(SQL_TIMESTAMP,sql_timestamp,-10,0);
+ my_int2str(SQL_DATE,sql_date,-10,0);
+ my_int2str(SQL_TIME,sql_time,-10,0);
myodbc_sqlstate2_init();
myodbc_ov2_inited= 1;
}
@@ -1177,15 +1141,9 @@
return;
myodbc_ov2_inited= 0;
-#if MYSQL_VERSION_ID >= 40100
- int2str(SQL_TYPE_TIMESTAMP,sql_timestamp,-10,0);
- int2str(SQL_TYPE_DATE,sql_date,-10,0);
- int2str(SQL_TYPE_TIME,sql_time,-10,0);
-#else
- int2str(SQL_TYPE_TIMESTAMP,sql_timestamp,-10);
- int2str(SQL_TYPE_DATE,sql_date,-10);
- int2str(SQL_TYPE_TIME,sql_time,-10);
-#endif
+ my_int2str(SQL_TYPE_TIMESTAMP,sql_timestamp,-10,0);
+ my_int2str(SQL_TYPE_DATE,sql_date,-10,0);
+ my_int2str(SQL_TYPE_TIME,sql_time,-10,0);
myodbc_sqlstate3_init();
}
}
Modified: trunk/driver/myutil.h
===================================================================
--- trunk/driver/myutil.h 2007-07-16 19:08:36 UTC (rev 584)
+++ trunk/driver/myutil.h 2007-07-16 19:15:56 UTC (rev 585)
@@ -62,6 +62,14 @@
#define MYLOG_DBC_QUERY(A,B)
#endif
+/* Wrappers to hide differences in client library versions. */
+#if MYSQL_VERSION_ID >= 40100
+# define my_int2str(val, dst, radix, upcase) \
+ int2str((val), (dst), (radix), (upcase))
+#else
+# define my_int2str(val, dst, radix, upcase) \
+ int2str((val), (dst), (radix))
+#endif
/*
Utility function prototypes that share among files
| Thread |
|---|
| • Connector/ODBC 3.51 commit: r585 - trunk/driver | jwinstead | 16 Jul |
