Skip to content

Commit

Permalink
cachedb_sql: properly fix git conflict (from f7d30b6)
Browse files Browse the repository at this point in the history
  • Loading branch information
liviuchircu committed Oct 1, 2014
1 parent f7d30b6 commit b0deb69
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions modules/cachedb_sql/cachedb_sql.c
Expand Up @@ -250,13 +250,13 @@ static int dbcache_get(cachedb_con *con, str* attr, str* res)
goto out_err;
}

if (CACHEDBSQL_FUNC(con).free_result(CACHEDBSQL_CON(con), db_res) < 0)
if (cdb_dbf.free_result(cdb_db_handle, db_res) < 0)
LM_DBG("failed to free result of query\n");

return 1;

out_err:
if (CACHEDBSQL_FUNC(con).free_result(CACHEDBSQL_CON(con), db_res) < 0)
if (cdb_dbf.free_result(cdb_db_handle, db_res) < 0)
LM_DBG("failed to free result of query\n");

return -1;
Expand Down

0 comments on commit b0deb69

Please sign in to comment.