浏览代码

userblacklist: convert module to use DB_TABLE_VERSION_ERROR helper

- convert module to use DB_TABLE_VERSION_ERROR helper
- unify error handling (properly close database on errors, null db handle)
Henning Westerholt 6 年之前
父节点
当前提交
33dccf230e
共有 1 个文件被更改,包括 9 次插入5 次删除
  1. 9 5
      src/modules/userblacklist/db_userblacklist.c

+ 9 - 5
src/modules/userblacklist/db_userblacklist.c

@@ -79,11 +79,15 @@ int userblacklist_db_init(void) {
 		LM_ERR("can't connect to database.\n");
 		LM_ERR("can't connect to database.\n");
 		return -1;
 		return -1;
 	}
 	}
-	if (
-	(db_check_table_version(&userblacklist_dbf, userblacklist_dbh, &userblacklist_table, userblacklist_version) < 0) ||
-	(db_check_table_version(&userblacklist_dbf, userblacklist_dbh, &globalblacklist_table, globalblacklist_version) < 0)
-	) {
-		LM_ERR("during table version check.\n");
+	if (db_check_table_version(&userblacklist_dbf, userblacklist_dbh,
+			&userblacklist_table, userblacklist_version) < 0) {
+		DB_TABLE_VERSION_ERROR(userblacklist_table);
+		userblacklist_db_close();
+		return -1;
+	}
+	if (db_check_table_version(&userblacklist_dbf, userblacklist_dbh,
+			&globalblacklist_table, globalblacklist_version) < 0) {
+		DB_TABLE_VERSION_ERROR(globalblacklist_table);
 		userblacklist_db_close();
 		userblacklist_db_close();
 		return -1;
 		return -1;
 	}
 	}