|
@@ -445,14 +445,17 @@ int db_table_version(const db_func_t* dbf, db1_con_t* connection, const str* tab
|
|
* Check the table version
|
|
* Check the table version
|
|
* 0 means ok, -1 means an error occurred
|
|
* 0 means ok, -1 means an error occurred
|
|
*/
|
|
*/
|
|
-int db_check_table_version(db_func_t* dbf, db1_con_t* dbh, const str* table, const unsigned int version)
|
|
|
|
|
|
+int db_check_table_version(db_func_t* dbf, db1_con_t* dbh, const str* table,
|
|
|
|
+ const unsigned int version)
|
|
{
|
|
{
|
|
int ver = db_table_version(dbf, dbh, table);
|
|
int ver = db_table_version(dbf, dbh, table);
|
|
if (ver < 0) {
|
|
if (ver < 0) {
|
|
LM_ERR("querying version for table %.*s\n", table->len, table->s);
|
|
LM_ERR("querying version for table %.*s\n", table->len, table->s);
|
|
return -1;
|
|
return -1;
|
|
- } else if (ver != version) {
|
|
|
|
- LM_ERR("invalid version %d for table %.*s found, expected %d (check table structure and table \"version\")\n", ver, table->len, table->s, version);
|
|
|
|
|
|
+ } else if (ver != (int)version) {
|
|
|
|
+ LM_ERR("invalid version %d for table %.*s found, expected %u"
|
|
|
|
+ " (check table structure and table \"version\")\n",
|
|
|
|
+ ver, table->len, table->s, version);
|
|
return -1;
|
|
return -1;
|
|
}
|
|
}
|
|
return 0;
|
|
return 0;
|