@@ -22,7 +22,7 @@

 /** @addtogroup mysql

  *  @{

  */

- 

+

 #include "db_mysql.h"

 #include "km_db_mysql.h"

@@ -126,9 +126,9 @@ static int mysql_mod_init(void)

 {

 #if MYSQL_VERSION_ID >= 40101

 	my_client_ver = mysql_get_client_version();

-	if ((my_client_ver >= 50025) || 

-		((my_client_ver >= 40122) && 

-		 (my_client_ver < 50000))) {

+	if ((my_client_ver >= 50025) ||

+		((my_client_ver >= 40122) &&

+			(my_client_ver < 50000))) {

 		if (my_send_to == 0) {

 			my_send_to= DEFAULT_MY_SEND_TO;

 		}

@@ -1,4 +1,4 @@

-/* 

+/*

  * MySQL module interface

  *

  * Copyright (C) 2001-2003 FhG Fokus

@@ -15,8 +15,8 @@

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  * GNU General Public License for more details.

  *

- * You should have received a copy of the GNU General Public License 

- * along with this program; if not, write to the Free Software 

+ * You should have received a copy of the GNU General Public License

+ * along with this program; if not, write to the Free Software

  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

  */

@@ -1,4 +1,4 @@

-/* 

+/*

  * MySQL module interface

  *

  * Copyright (C) 2001-2003 FhG Fokus

@@ -16,8 +16,8 @@

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  * GNU General Public License for more details.

  *

- * You should have received a copy of the GNU General Public License 

- * along with this program; if not, write to the Free Software 

+ * You should have received a copy of the GNU General Public License

+ * along with this program; if not, write to the Free Software

  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

  */

@@ -65,7 +65,7 @@ static param_export_t params[] = {

 	{0, 0, 0}

 };

-struct kam_module_exports kam_exports = {	

+struct kam_module_exports kam_exports = {

 	"db_mysql",

 	DEFAULT_DLFLAGS, /* dlopen flags */

 	cmds,

@@ -1,4 +1,4 @@

-/* 

+/*

  * MySQL module interface

  *

  * Copyright (C) 2001-2003 FhG Fokus

@@ -16,8 +16,8 @@

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  * GNU General Public License for more details.

  *

- * You should have received a copy of the GNU General Public License 

- * along with this program; if not, write to the Free Software 

+ * You should have received a copy of the GNU General Public License

+ * along with this program; if not, write to the Free Software

  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

  *

  */

@@ -1,4 +1,4 @@

-/* 

+/*

  * MySQL module core functions

  *

  * Copyright (C) 2001-2003 FhG Fokus

@@ -16,8 +16,8 @@

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  * GNU General Public License for more details.

  *

- * You should have received a copy of the GNU General Public License 

- * along with this program; if not, write to the Free Software 

+ * You should have received a copy of the GNU General Public License

+ * along with this program; if not, write to the Free Software

  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

  */

@@ -68,7 +68,7 @@ static char *mysql_sql_buf;

  * \return zero on success, negative value on failure

  */

 static int db_mysql_submit_query(const db1_con_t* _h, const str* _s)

-{	

+{

 	time_t t;

 	int i, code;

@@ -137,9 +137,9 @@ void db_mysql_async_exec_task(void *param)

 {

 	str *p;

 	db1_con_t* dbc;

-	

+

 	p = (str*)param;

-	

+

 	dbc = db_mysql_init(&p[0]);

 	if(dbc==NULL) {

@@ -148,7 +148,7 @@ void db_mysql_async_exec_task(void *param)

 	}

 	if(db_mysql_submit_query(dbc, &p[1])<0) {

 		LM_ERR("failed to execute query [%.*s] on async worker\n",

-		       (p[1].len>100)?100:p[1].len, p[1].s);

+				(p[1].len>100)?100:p[1].len, p[1].s);

 	}

 	db_mysql_close(dbc);

 }

@@ -295,20 +295,20 @@ done:

  */

 int db_mysql_free_result(const db1_con_t* _h, db1_res_t* _r)

 {

-     if ((!_h) || (!_r)) {

-	     LM_ERR("invalid parameter value\n");

-	     return -1;

-     }

-

-     mysql_free_result(RES_RESULT(_r));

-     RES_RESULT(_r) = 0;

-     pkg_free(RES_PTR(_r));

-

-     if (db_free_result(_r) < 0) {

-	     LM_ERR("unable to free result structure\n");

-	     return -1;

-     }

-     return 0;

+	if ((!_h) || (!_r)) {

+		LM_ERR("invalid parameter value\n");

+		return -1;

+	}

+

+	mysql_free_result(RES_RESULT(_r));

+	RES_RESULT(_r) = 0;

+	pkg_free(RES_PTR(_r));

+

+	if (db_free_result(_r) < 0) {

+		LM_ERR("unable to free result structure\n");

+		return -1;

+	}

+	return 0;

 }

@@ -326,8 +326,8 @@ int db_mysql_free_result(const db1_con_t* _h, db1_res_t* _r)

  * \return zero on success, negative value on failure

  */

 int db_mysql_query(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _op,

-	     const db_val_t* _v, const db_key_t* _c, const int _n, const int _nc,

-	     const db_key_t _o, db1_res_t** _r)

+		const db_val_t* _v, const db_key_t* _c, const int _n, const int _nc,

+		const db_key_t _o, db1_res_t** _r)

 {

 	return db_do_query(_h, _k, _op, _v, _c, _n, _nc, _o, _r,

 	db_mysql_val2str, db_mysql_submit_query, db_mysql_store_result);

@@ -526,8 +526,8 @@ int db_mysql_delete(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _o,

  * \param _un number of columns to update

  * \return zero on success, negative value on failure

  */

-int db_mysql_update(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _o, 

-	const db_val_t* _v, const db_key_t* _uk, const db_val_t* _uv, const int _n, 

+int db_mysql_update(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _o,

+	const db_val_t* _v, const db_key_t* _uk, const db_val_t* _uv, const int _n,

 	const int _un)

 {

 	return db_do_update(_h, _k, _o, _v, _uk, _uv, _n, _un, db_mysql_val2str,

@@ -716,8 +716,8 @@ int db_mysql_end_transaction(db1_con_t* _h)

 	}

 	/* Only _end_ the transaction after the raw_query.  That way, if the

- 	   raw_query fails, and the calling module does an abort_transaction()

-	   to clean-up, a ROLLBACK will be sent to the DB. */

+	 * raw_query fails, and the calling module does an abort_transaction()

+	 * to clean-up, a ROLLBACK will be sent to the DB. */

 	CON_TRANSACTION(_h) = 0;

 	if(db_mysql_unlock_tables(_h)<0)

@@ -749,7 +749,7 @@ int db_mysql_abort_transaction(db1_con_t* _h)

 	}

 	/* Whether the rollback succeeds or not we need to _end_ the

- 	   transaction now or all future starts will fail */

+	 * transaction now or all future starts will fail */

 	CON_TRANSACTION(_h) = 0;

 	if (db_mysql_raw_query(_h, &rollback_query_str, NULL) < 0)

@@ -775,23 +775,23 @@ done:

 /**

-  * Insert a row into a specified table, update on duplicate key.

-  * \param _h structure representing database connection

-  * \param _k key names

-  * \param _v values of the keys

-  * \param _n number of key=value pairs

+ * Insert a row into a specified table, update on duplicate key.

+ * \param _h structure representing database connection

+ * \param _k key names

+ * \param _v values of the keys

+ * \param _n number of key=value pairs

  */

- int db_mysql_insert_update(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v,

+int db_mysql_insert_update(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v,

 	const int _n)

- {

+{

 	int off, ret;

 	static str  sql_str;

- 

+

 	if ((!_h) || (!_k) || (!_v) || (!_n)) {

 		LM_ERR("invalid parameter value\n");

 		return -1;

 	}

- 

+

 	ret = snprintf(mysql_sql_buf, sql_buffer_size, "insert into %s%.*s%s (",

 			CON_TQUOTESZ(_h), CON_TABLE(_h)->len, CON_TABLE(_h)->s, CON_TQUOTESZ(_h));

 	if (ret < 0 || ret >= sql_buffer_size) goto error;

@@ -809,18 +809,18 @@ done:

 	off += ret;

 	*(mysql_sql_buf + off++) = ')';

-	

+

 	ret = snprintf(mysql_sql_buf + off, sql_buffer_size - off, " on duplicate key update ");

 	if (ret < 0 || ret >= (sql_buffer_size - off)) goto error;

 	off += ret;

-	

+

 	ret = db_print_set(_h, mysql_sql_buf + off, sql_buffer_size - off, _k, _v, _n, db_mysql_val2str);

 	if (ret < 0) return -1;

 	off += ret;

-	

+

 	sql_str.s = mysql_sql_buf;

 	sql_str.len = off;

- 

+

 	if (db_mysql_submit_query(_h, &sql_str) < 0) {

 		LM_ERR("error while submitting query\n");

 		return -2;

@@ -841,7 +841,8 @@ error:

  * \param _n number of key=value pairs

  * \return zero on success, negative value on failure

  */

-int db_mysql_insert_delayed(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v, const int _n)

+int db_mysql_insert_delayed(const db1_con_t* _h, const db_key_t* _k,

+		const db_val_t* _v, const int _n)

 {

 	return db_do_insert_delayed(_h, _k, _v, _n, db_mysql_val2str,

 	db_mysql_submit_query);

@@ -855,7 +856,8 @@ int db_mysql_insert_delayed(const db1_con_t* _h, const db_key_t* _k, const db_va

  * \param _n number of key=value pairs

  * \return zero on success, negative value on failure

  */

-int db_mysql_insert_async(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v, const int _n)

+int db_mysql_insert_async(const db1_con_t* _h, const db_key_t* _k,

+		const db_val_t* _v, const int _n)

 {

 	return db_do_insert(_h, _k, _v, _n, db_mysql_val2str,

 	db_mysql_submit_query_async);

@@ -882,15 +884,15 @@ int db_mysql_use_table(db1_con_t* _h, const str* _t)

  */

 int db_mysql_alloc_buffer(void)

 {

-    if (db_api_init())

-    {

-        LM_ERR("Failed to initialise db api\n");

+	if (db_api_init())

+	{

+		LM_ERR("Failed to initialise db api\n");

 		return -1;

-    }

+	}

-    mysql_sql_buf = (char*)malloc(sql_buffer_size);

-    if (mysql_sql_buf == NULL)

-        return -1;

-    else

-        return 0;

+	mysql_sql_buf = (char*)malloc(sql_buffer_size);

+	if (mysql_sql_buf == NULL)

+		return -1;

+	else

+		return 0;

 }

@@ -16,8 +16,8 @@

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  * GNU General Public License for more details.

  *

- * You should have received a copy of the GNU General Public License 

- * along with this program; if not, write to the Free Software 

+ * You should have received a copy of the GNU General Public License

+ * along with this program; if not, write to the Free Software

  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

  */

@@ -63,8 +63,8 @@ int db_mysql_free_result(const db1_con_t* _h, db1_res_t* _r);

  * Do a query

  */

 int db_mysql_query(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _op,

-	     const db_val_t* _v, const db_key_t* _c, const int _n, const int _nc,

-	     const db_key_t _o, db1_res_t** _r);

+		const db_val_t* _v, const db_key_t* _c, const int _n, const int _nc,

+		const db_key_t _o, db1_res_t** _r);

 /*! \brief

@@ -88,13 +88,14 @@ int db_mysql_raw_query_async(const db1_con_t* _h, const str* _s);

 /*! \brief

  * Insert a row into table

  */

-int db_mysql_insert(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v, const int _n);

+int db_mysql_insert(const db1_con_t* _h, const db_key_t* _k,

+		const db_val_t* _v, const int _n);

 /*! \brief

  * Delete a row from table

  */

-int db_mysql_delete(const db1_con_t* _h, const db_key_t* _k, const 

+int db_mysql_delete(const db1_con_t* _h, const db_key_t* _k, const

 	db_op_t* _o, const db_val_t* _v, const int _n);

@@ -142,7 +143,8 @@ int db_mysql_abort_transaction(db1_con_t* _h);

 /*! \brief

  * Insert a row into table, update on duplicate key

  */

-int db_mysql_insert_update(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v,

+int db_mysql_insert_update(const db1_con_t* _h, const db_key_t* _k,

+		const db_val_t* _v,

 	const int _n);

@@ -1,4 +1,4 @@

-/* 

+/*

  * Copyright (C) 2001-2003 FhG Fokus

  * Copyright (C) 2008 1&1 Internet AG

  *

@@ -14,8 +14,8 @@

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  * GNU General Public License for more details.

  *

- * You should have received a copy of the GNU General Public License 

- * along with this program; if not, write to the Free Software 

+ * You should have received a copy of the GNU General Public License

+ * along with this program; if not, write to the Free Software

  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

  */

@@ -1,4 +1,4 @@

-/* 

+/*

  * MySQL module result related functions

  *

  * Copyright (C) 2001-2003 FhG Fokus

@@ -16,8 +16,8 @@

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  * GNU General Public License for more details.

  *

- * You should have received a copy of the GNU General Public License 

- * along with this program; if not, write to the Free Software 

+ * You should have received a copy of the GNU General Public License

+ * along with this program; if not, write to the Free Software

  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

  */

@@ -65,7 +65,7 @@ int db_mysql_get_columns(const db1_con_t* _h, db1_res_t* _r)

 	} else {

 		LM_DBG("%d columns returned from the query\n", RES_COL_N(_r));

 	}

-	

+

 	if (db_allocate_columns(_r, RES_COL_N(_r)) != 0) {

 		RES_COL_N(_r) = 0;

 		LM_ERR("could not allocate columns\n");

@@ -1,4 +1,4 @@

-/* 

+/*

  * MySQL module result related functions

  *

  * Copyright (C) 2001-2003 FhG Fokus

@@ -16,8 +16,8 @@

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  * GNU General Public License for more details.

  *

- * You should have received a copy of the GNU General Public License 

- * along with this program; if not, write to the Free Software 

+ * You should have received a copy of the GNU General Public License

+ * along with this program; if not, write to the Free Software

  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

  */

@@ -1,4 +1,4 @@

-/* 

+/*

  * MySQL module row related functions

  *

  * Copyright (C) 2001-2003 FhG Fokus

@@ -16,8 +16,8 @@

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  * GNU General Public License for more details.

  *

- * You should have received a copy of the GNU General Public License 

- * along with this program; if not, write to the Free Software 

+ * You should have received a copy of the GNU General Public License

+ * along with this program; if not, write to the Free Software

  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

  */

@@ -57,12 +57,12 @@ int db_mysql_convert_row(const db1_con_t* _h, db1_res_t* _res, db_row_t* _r)

 		LM_ERR("could not allocate row");

 		return -2;

 	}

-	

+

 	lengths = mysql_fetch_lengths(RES_RESULT(_res));

 	for(i = 0; i < RES_COL_N(_res); i++) {

 		if (db_str2val(RES_TYPES(_res)[i], &(ROW_VALUES(_r)[i]),

-			    ((MYSQL_ROW)RES_ROW(_res))[i], lengths[i], 0) < 0) {

+				((MYSQL_ROW)RES_ROW(_res))[i], lengths[i], 0) < 0) {

 			LM_ERR("failed to convert value\n");

 			LM_DBG("free row at %p\n", _r);

 			db_free_row(_r);

@@ -1,4 +1,4 @@

-/* 

+/*

  * MySQL module row related functions

  *

  * Copyright (C) 2001-2003 FhG Fokus

@@ -16,8 +16,8 @@

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  * GNU General Public License for more details.

  *

- * You should have received a copy of the GNU General Public License 

- * along with this program; if not, write to the Free Software 

+ * You should have received a copy of the GNU General Public License

+ * along with this program; if not, write to the Free Software

  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

  */

@@ -1,4 +1,4 @@

-/* 

+/*

  * Copyright (C) 2001-2003 FhG Fokus

  * Copyright (C) 2008 1&1 Internet AG

  *

@@ -14,8 +14,8 @@

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  * GNU General Public License for more details.

  *

- * You should have received a copy of the GNU General Public License 

- * along with this program; if not, write to the Free Software 

+ * You should have received a copy of the GNU General Public License

+ * along with this program; if not, write to the Free Software

  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

  */

@@ -81,7 +81,8 @@ int db_mysql_val2str(const db1_con_t* _c, const db_val_t* _v, char* _s, int* _le

 		} else {

 			old_s = _s;

 			*_s++ = '\'';

-			_s += mysql_real_escape_string(CON_CONNECTION(_c), _s, VAL_STRING(_v), l);

+			_s += mysql_real_escape_string(CON_CONNECTION(_c), _s,

+					VAL_STRING(_v), l);

 			*_s++ = '\'';

 			*_s = '\0'; /* FIXME */

 			*_len = _s - old_s;

@@ -96,7 +97,8 @@ int db_mysql_val2str(const db1_con_t* _c, const db_val_t* _v, char* _s, int* _le

 		} else {

 			old_s = _s;

 			*_s++ = '\'';

-			_s += mysql_real_escape_string(CON_CONNECTION(_c), _s, VAL_STR(_v).s, VAL_STR(_v).len);

+			_s += mysql_real_escape_string(CON_CONNECTION(_c), _s,

+					VAL_STR(_v).s, VAL_STR(_v).len);

 			*_s++ = '\'';

 			*_s = '\0';

 			*_len = _s - old_s;

@@ -117,7 +119,7 @@ int db_mysql_val2str(const db1_con_t* _c, const db_val_t* _v, char* _s, int* _le

 			*_s = '\0';

 			*_len = _s - old_s;

 			return 0;

-		}			

+		}

 		break;

 	default:

@@ -1,4 +1,4 @@

-/* 

+/*

  * Copyright (C) 2001-2003 FhG Fokus

  * Copyright (C) 2008 1&1 Internet AG

  *

@@ -14,8 +14,8 @@

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  * GNU General Public License for more details.

  *

- * You should have received a copy of the GNU General Public License 

- * along with this program; if not, write to the Free Software 

+ * You should have received a copy of the GNU General Public License

+ * along with this program; if not, write to the Free Software

  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

  */

@@ -1,4 +1,4 @@

-/* 

+/*

  * Copyright (C) 2001-2003 FhG Fokus

  * Copyright (C) 2006-2007 iptelorg GmbH

  *

@@ -14,8 +14,8 @@

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  * GNU General Public License for more details.

  *

- * You should have received a copy of the GNU General Public License 

- * along with this program; if not, write to the Free Software 

+ * You should have received a copy of the GNU General Public License

+ * along with this program; if not, write to the Free Software

  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

  */

@@ -25,7 +25,7 @@

 /* the following macro will break the compile on solaris */

 #if !defined (__SVR4) && !defined (__sun)

-   #define _XOPEN_SOURCE 4     /* bsd */

+#define _XOPEN_SOURCE 4     /* bsd */

 #endif

 #define _XOPEN_SOURCE_EXTENDED 1    /* solaris */

 #define _SVID_SOURCE 1 /* timegm */

@@ -113,7 +113,7 @@ static str strings[] = {

 #define APPEND_CSTR(p, cstr) do { \

-    int _len = strlen(cstr);      \

+	int _len = strlen(cstr);      \

 	memcpy((p), (cstr), _len);	  \

 	(p) += _len;				  \

 } while(0)

@@ -132,8 +132,8 @@ static void my_cmd_free(db_cmd_t* cmd, struct my_cmd* payload)

 /** Builds a DELETE SQL statement.The function builds DELETE statement where

- * cmd->match specify WHERE clause.  

- * @param sql_cmd SQL statement as a result of this function 

+ * cmd->match specify WHERE clause.

+ * @param sql_cmd SQL statement as a result of this function

  * @param cmd input for statement creation

  * @return -1 on error, 0 on success

  */

@@ -153,19 +153,19 @@ static int build_delete_cmd(str* sql_cmd, db_cmd_t* cmd)

 			sql_cmd->len += strlen(fld[i].name);

 			switch(fld[i].op) {

-			case DB_EQ:  sql_cmd->len += strings[STR_OP_EQ].len; break;

-			case DB_NE:  sql_cmd->len += strings[STR_OP_NE].len; break;

-			case DB_LT:  sql_cmd->len += strings[STR_OP_LT].len; break;

-			case DB_GT:  sql_cmd->len += strings[STR_OP_GT].len; break;

-			case DB_LEQ: sql_cmd->len += strings[STR_OP_LEQ].len; break;

-			case DB_GEQ: sql_cmd->len += strings[STR_OP_GEQ].len; break;

-			default:

-				ERR("mysql: Unsupported db_fld operator %d\n", fld[i].op);

-				return -1;

+				case DB_EQ:  sql_cmd->len += strings[STR_OP_EQ].len; break;

+				case DB_NE:  sql_cmd->len += strings[STR_OP_NE].len; break;

+				case DB_LT:  sql_cmd->len += strings[STR_OP_LT].len; break;

+				case DB_GT:  sql_cmd->len += strings[STR_OP_GT].len; break;

+				case DB_LEQ: sql_cmd->len += strings[STR_OP_LEQ].len; break;

+				case DB_GEQ: sql_cmd->len += strings[STR_OP_GEQ].len; break;

+				default:

+					ERR("mysql: Unsupported db_fld operator %d\n", fld[i].op);

+					return -1;

 			}

 			sql_cmd->len += strings[STR_ESC].len;

-			

+

 			if (!DB_FLD_LAST(fld[i + 1])) sql_cmd->len += strings[STR_AND].len;

 		}

 	}

@@ -176,7 +176,7 @@ static int build_delete_cmd(str* sql_cmd, db_cmd_t* cmd)

 		return -1;

 	}

 	p = sql_cmd->s;

-	

+

 	APPEND_STR(p, strings[STR_DELETE]);

 	APPEND_STR(p, cmd->table);

@@ -187,19 +187,19 @@ static int build_delete_cmd(str* sql_cmd, db_cmd_t* cmd)

 			APPEND_CSTR(p, fld[i].name);

 			switch(fld[i].op) {

-			case DB_EQ:  APPEND_STR(p, strings[STR_OP_EQ]);  break;

-			case DB_NE:  APPEND_STR(p, strings[STR_OP_NE]);  break;

-			case DB_LT:  APPEND_STR(p, strings[STR_OP_LT]);  break;

-			case DB_GT:  APPEND_STR(p, strings[STR_OP_GT]);  break;

-			case DB_LEQ: APPEND_STR(p, strings[STR_OP_LEQ]); break;

-			case DB_GEQ: APPEND_STR(p, strings[STR_OP_GEQ]); break;

+				case DB_EQ:  APPEND_STR(p, strings[STR_OP_EQ]);  break;

+				case DB_NE:  APPEND_STR(p, strings[STR_OP_NE]);  break;

+				case DB_LT:  APPEND_STR(p, strings[STR_OP_LT]);  break;

+				case DB_GT:  APPEND_STR(p, strings[STR_OP_GT]);  break;

+				case DB_LEQ: APPEND_STR(p, strings[STR_OP_LEQ]); break;

+				case DB_GEQ: APPEND_STR(p, strings[STR_OP_GEQ]); break;

 			}

-			

+

 			APPEND_STR(p, strings[STR_ESC]);

 			if (!DB_FLD_LAST(fld[i + 1])) APPEND_STR(p, strings[STR_AND]);

 		}

 	}

-			

+

 	*p = '\0';

 	return 0;

 }

@@ -237,19 +237,19 @@ static int build_select_cmd(str* sql_cmd, db_cmd_t* cmd)

 			sql_cmd->len += strlen(fld[i].name);

 			switch(fld[i].op) {

-			case DB_EQ:  sql_cmd->len += strings[STR_OP_EQ].len; break;

-			case DB_NE:  sql_cmd->len += strings[STR_OP_NE].len; break;

-			case DB_LT:  sql_cmd->len += strings[STR_OP_LT].len; break;

-			case DB_GT:  sql_cmd->len += strings[STR_OP_GT].len; break;

-			case DB_LEQ: sql_cmd->len += strings[STR_OP_LEQ].len; break;

-			case DB_GEQ: sql_cmd->len += strings[STR_OP_GEQ].len; break;

-			default:

-				ERR("mysql: Unsupported db_fld operator %d\n", fld[i].op);

-				return -1;

+				case DB_EQ:  sql_cmd->len += strings[STR_OP_EQ].len; break;

+				case DB_NE:  sql_cmd->len += strings[STR_OP_NE].len; break;

+				case DB_LT:  sql_cmd->len += strings[STR_OP_LT].len; break;

+				case DB_GT:  sql_cmd->len += strings[STR_OP_GT].len; break;

+				case DB_LEQ: sql_cmd->len += strings[STR_OP_LEQ].len; break;

+				case DB_GEQ: sql_cmd->len += strings[STR_OP_GEQ].len; break;

+				default:

+					ERR("mysql: Unsupported db_fld operator %d\n", fld[i].op);

+					return -1;

 			}

 			sql_cmd->len += strings[STR_ESC].len;

-			

+

 			if (!DB_FLD_LAST(fld[i + 1])) sql_cmd->len += strings[STR_AND].len;

 		}

 	}

@@ -260,7 +260,7 @@ static int build_select_cmd(str* sql_cmd, db_cmd_t* cmd)

 		return -1;

 	}

 	p = sql_cmd->s;

-	

+

 	APPEND_STR(p, strings[STR_SELECT]);

 	if (DB_FLD_EMPTY(cmd->result)) {

 		*p++ = '*';

@@ -280,14 +280,14 @@ static int build_select_cmd(str* sql_cmd, db_cmd_t* cmd)

 			APPEND_CSTR(p, fld[i].name);

 			switch(fld[i].op) {

-			case DB_EQ:  APPEND_STR(p, strings[STR_OP_EQ]);  break;

-			case DB_NE:  APPEND_STR(p, strings[STR_OP_NE]);  break;

-			case DB_LT:  APPEND_STR(p, strings[STR_OP_LT]);  break;

-			case DB_GT:  APPEND_STR(p, strings[STR_OP_GT]);  break;

-			case DB_LEQ: APPEND_STR(p, strings[STR_OP_LEQ]); break;

-			case DB_GEQ: APPEND_STR(p, strings[STR_OP_GEQ]); break;

+				case DB_EQ:  APPEND_STR(p, strings[STR_OP_EQ]);  break;

+				case DB_NE:  APPEND_STR(p, strings[STR_OP_NE]);  break;

+				case DB_LT:  APPEND_STR(p, strings[STR_OP_LT]);  break;

+				case DB_GT:  APPEND_STR(p, strings[STR_OP_GT]);  break;

+				case DB_LEQ: APPEND_STR(p, strings[STR_OP_LEQ]); break;

+				case DB_GEQ: APPEND_STR(p, strings[STR_OP_GEQ]); break;

 			}

-			

+

 			APPEND_STR(p, strings[STR_ESC]);

 			if (!DB_FLD_LAST(fld[i + 1])) APPEND_STR(p, strings[STR_AND]);

 		}

@@ -319,7 +319,7 @@ static int build_replace_cmd(str* sql_cmd, db_cmd_t* cmd)

 		if (!DB_FLD_LAST(fld[i + 1])) sql_cmd->len += 2; /* , twice */

 	}

 	sql_cmd->len += strings[STR_VALUES].len;

-    sql_cmd->len += 1; /* ) */

+	sql_cmd->len += 1; /* ) */

 	sql_cmd->s = pkg_malloc(sql_cmd->len + 1);

 	if (sql_cmd->s == NULL) {

@@ -327,7 +327,7 @@ static int build_replace_cmd(str* sql_cmd, db_cmd_t* cmd)

 		return -1;

 	}

 	p = sql_cmd->s;

-	

+

 	APPEND_STR(p, strings[STR_REPLACE]);

 	APPEND_STR(p, cmd->table);

 	*p++ = ' ';

@@ -356,7 +356,7 @@ struct string_buffer {

 	char *s;			/**< allocated memory itself */

 	int   len;			/**< used memory */

 	int   size;			/**< total size of allocated memory */

-	int   increment;	/**< increment when realloc is necessary */ 

+	int   increment;	/**< increment when realloc is necessary */

 };

@@ -398,7 +398,7 @@ static inline int sb_add(struct string_buffer *sb, str *nstr)

 /**

  *  Set members of str variable.

- *  Used for temporary str variables. 

+ *  Used for temporary str variables.

  */

 static inline str* set_str(str *str, const char *s)

 {

@@ -447,14 +447,14 @@ static int build_update_cmd(str* sql_cmd, db_cmd_t* cmd)

 			rv |= sb_add(&sql_buf, set_str(&tmpstr, fld[i].name));

 			switch(fld[i].op) {

-			case DB_EQ:  rv |= sb_add(&sql_buf, &strings[STR_OP_EQ]);  break;

-			case DB_NE:  rv |= sb_add(&sql_buf, &strings[STR_OP_NE]);  break;

-			case DB_LT:  rv |= sb_add(&sql_buf, &strings[STR_OP_LT]);  break;

-			case DB_GT:  rv |= sb_add(&sql_buf, &strings[STR_OP_GT]);  break;

-			case DB_LEQ: rv |= sb_add(&sql_buf, &strings[STR_OP_LEQ]); break;

-			case DB_GEQ: rv |= sb_add(&sql_buf, &strings[STR_OP_GEQ]); break;

+				case DB_EQ:  rv |= sb_add(&sql_buf, &strings[STR_OP_EQ]);  break;

+				case DB_NE:  rv |= sb_add(&sql_buf, &strings[STR_OP_NE]);  break;

+				case DB_LT:  rv |= sb_add(&sql_buf, &strings[STR_OP_LT]);  break;

+				case DB_GT:  rv |= sb_add(&sql_buf, &strings[STR_OP_GT]);  break;

+				case DB_LEQ: rv |= sb_add(&sql_buf, &strings[STR_OP_LEQ]); break;

+				case DB_GEQ: rv |= sb_add(&sql_buf, &strings[STR_OP_GEQ]); break;

 			}

-			

+

 			rv |= sb_add(&sql_buf, &strings[STR_ESC]);

 			if (!DB_FLD_LAST(fld[i + 1])) rv |= sb_add(&sql_buf, &strings[STR_AND]);

 		}

@@ -477,7 +477,7 @@ static inline void update_field(MYSQL_BIND *param, db_fld_t* fld)

 {

 	struct my_fld* fp;      /* field payload */

 	struct tm* t;

-	

+

 	fp = DB_GET_PAYLOAD(fld);

 #ifndef MYSQL_FAKE_NULL

@@ -486,60 +486,60 @@ static inline void update_field(MYSQL_BIND *param, db_fld_t* fld)

 #else

 	if (fld->flags & DB_NULL) {

 		switch(fld->type) {

+			case DB_STR:

+			case DB_CSTR:

+				param->buffer = FAKE_NULL_STR.s;

+				fp->length = FAKE_NULL_STR.len;

+				break;

+			case DB_INT:

+				*(int*)param->buffer = FAKE_NULL_INT;

+				break;

+			case DB_BLOB:

+			case DB_DATETIME:

+			case DB_NONE:

+			case DB_FLOAT:

+			case DB_DOUBLE:

+			case DB_BITMAP:

+				/* we don't have fake null value for these types */

+				fp->is_null = DB_NULL;

+				break;

+		}

+		return;

+	}

+#endif

+	switch(fld->type) {

 		case DB_STR:

-		case DB_CSTR:

-			param->buffer = FAKE_NULL_STR.s;

-			fp->length = FAKE_NULL_STR.len;

-			break;

-		case DB_INT:

-			*(int*)param->buffer = FAKE_NULL_INT;

+			param->buffer = fld->v.lstr.s;

+			fp->length = fld->v.lstr.len;

 			break;

+

 		case DB_BLOB:

+			param->buffer = fld->v.blob.s;

+			fp->length = fld->v.blob.len;

+			break;

+

+		case DB_CSTR:

+			param->buffer = (char*)fld->v.cstr;

+			fp->length = strlen(fld->v.cstr);

+			break;

+

 		case DB_DATETIME:

+			t = gmtime(&fld->v.time);

+			fp->time.second = t->tm_sec;

+			fp->time.minute = t->tm_min;

+			fp->time.hour = t->tm_hour;

+			fp->time.day = t->tm_mday;

+			fp->time.month = t->tm_mon + 1;

+			fp->time.year = t->tm_year + 1900;

+			break;

+

 		case DB_NONE:

+		case DB_INT:

 		case DB_FLOAT:

 		case DB_DOUBLE:

 		case DB_BITMAP:

-			/* we don't have fake null value for these types */

-			fp->is_null = DB_NULL;

+			/* No need to do anything for these types */

 			break;

-		}

-		return;

-	}

-#endif

-	switch(fld->type) {

-	case DB_STR:

-		param->buffer = fld->v.lstr.s;

-		fp->length = fld->v.lstr.len;

-		break;

-

-	case DB_BLOB:

-		param->buffer = fld->v.blob.s;

-		fp->length = fld->v.blob.len;

-		break;

-

-	case DB_CSTR:

-		param->buffer = (char*)fld->v.cstr;

-		fp->length = strlen(fld->v.cstr);

-		break;

-

-	case DB_DATETIME:

-		t = gmtime(&fld->v.time);

-		fp->time.second = t->tm_sec;

-		fp->time.minute = t->tm_min;

-		fp->time.hour = t->tm_hour;

-		fp->time.day = t->tm_mday;

-		fp->time.month = t->tm_mon + 1;

-		fp->time.year = t->tm_year + 1900;

-		break;

-		

-	case DB_NONE:

-	case DB_INT:

-	case DB_FLOAT:

-	case DB_DOUBLE:

-	case DB_BITMAP:

-		/* No need to do anything for these types */

-		break;

 	}

 }

@@ -594,73 +594,73 @@ static inline int update_result(db_fld_t* result, MYSQL_STMT* st)

 		}

 		switch(result[i].type) {

-		case DB_STR: