auto import from //branches/cupcake/...@132276

This commit is contained in:
The Android Open Source Project
2009-02-19 10:57:29 -08:00
parent 2489551343
commit 6f04a0f4c7
29 changed files with 1594 additions and 845 deletions

View File

@@ -46,7 +46,6 @@ typedef struct {
struct __res_state _nres[1];
unsigned _serial;
struct prop_info* _pi;
struct hostent* _hostent;
struct res_static _rstatic[1];
} _res_thread;
@@ -66,9 +65,9 @@ _res_thread_alloc(void)
if ( res_ninit( rt->_nres ) < 0 ) {
free(rt);
rt = NULL;
} else {
memset(rt->_rstatic, 0, sizeof rt->_rstatic);
}
rt->_hostent = NULL;
memset(rt->_rstatic, 0, sizeof rt->_rstatic);
}
return rt;
}
@@ -93,7 +92,6 @@ _res_thread_free( void* _rt )
_res_thread* rt = _rt;
_res_static_done(rt->_rstatic);
_resolv_hostent_free(rt->_hostent);
res_ndestroy(rt->_nres);
free(rt);
}
@@ -132,6 +130,7 @@ _res_thread_get(void)
rt = NULL;
pthread_setspecific( _res_key, rt );
}
_resolv_cache_reset(rt->_serial);
return rt;
}
@@ -177,14 +176,6 @@ __res_put_state(res_state res)
res=res;
}
struct hostent**
__get_res_cache_hostent_p(void)
{
_res_thread* rt = _res_thread_get();
return rt ? &rt->_hostent : NULL;
}
res_static
__res_get_static(void)
{