external/uhub
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of github.com:janvidar/uhub

Browse Source
This commit is contained in:
Jan Vidar Krey
2014-10-16 23:10:28 +02:00
parent 037ceff0a5 280e28a6d4
commit 418db22931
6 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/connection.c
View File

@@ -283,7 +283,6 @@ static int net_connect_job_process(struct net_connect_job* job)
*/
static void net_connect_job_internal_cb(struct net_connection* con, int event, void* ptr)
{
int ret;
struct net_connect_job* job = net_con_get_ptr(con);
struct net_connect_job* next_job = job->next;
struct net_connect_handle* handle = job->handle;
@@ -441,7 +440,6 @@ static int net_con_connect_dns_callback(struct net_dns_job* job, const struct ne
struct net_connect_handle* handle = (struct net_connect_handle*) net_dns_job_get_ptr(job);
handle->dns = NULL;
size_t usable = 0;
int ret;
LOG_TRACE("net_con_connect(): async - Got DNS results");
if (!result)

3
src/network/dnsresolver.c
View File

@@ -99,9 +99,6 @@ void net_dns_initialize()
void net_dns_destroy()
{
struct net_dns_job* job;
struct net_dns_result* result;
uhub_mutex_lock(&g_dns->mutex);
LOG_TRACE("net_dns_destroy(): jobs=%d", (int) list_size(g_dns->jobs));
list_clear(g_dns->jobs, &shutdown_free_jobs);

4
src/util/rbtree.h
View File

@@ -62,8 +62,8 @@ struct rb_tree
extern struct rb_tree* rb_tree_create(rb_tree_compare compare, rb_tree_alloc alloc, rb_tree_free dealloc);
/**
* Deletes the tree and all the nodes.
* But not the content inside the nodes.
* Delete the tree.
* Assumes that the tree is empty.
*/
extern void rb_tree_destroy(struct rb_tree*);