diff options
| author | ptitSeb <sebastien.chev@gmail.com> | 2022-10-19 22:59:07 +0200 |
|---|---|---|
| committer | ptitSeb <sebastien.chev@gmail.com> | 2022-10-19 22:59:19 +0200 |
| commit | d6b9df6ca260dbada8dac68ee6857d89005a810e (patch) | |
| tree | d36ec4d582307cf46056a58e2ce0696226d176af /src/wrapped/wrappedxml2.c | |
| parent | 4fbeca0aa3f55f3569bb3212ca130d18d20c3dc3 (diff) | |
| download | box64-d6b9df6ca260dbada8dac68ee6857d89005a810e.tar.gz box64-d6b9df6ca260dbada8dac68ee6857d89005a810e.zip | |
Small refactor and simplification of library_t structure and box64context_t
Diffstat (limited to 'src/wrapped/wrappedxml2.c')
| -rwxr-xr-x | src/wrapped/wrappedxml2.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/wrapped/wrappedxml2.c b/src/wrapped/wrappedxml2.c index e8c68206..271edfdd 100755 --- a/src/wrapped/wrappedxml2.c +++ b/src/wrapped/wrappedxml2.c @@ -67,17 +67,17 @@ void* my_wrap_xmlMemStrdup(void* p) #define ADDED_INIT() \ void** p; \ - p=dlsym(lib->priv.w.lib, "xmlFree"); \ - my_xmlFree = (p && *p)?AddBridge(lib->priv.w.bridge, vFp, *p, 0, "my_wrap_xmlFree"):0; \ + p=dlsym(lib->w.lib, "xmlFree"); \ + my_xmlFree = (p && *p)?AddBridge(lib->w.bridge, vFp, *p, 0, "my_wrap_xmlFree"):0; \ if(p) *p = my_wrap_xmlFree; \ - p=dlsym(lib->priv.w.lib, "xmlMalloc"); \ - my_xmlMalloc = (p && *p)?AddBridge(lib->priv.w.bridge, pFL, *p, 0, "my_wrap_xmlMalloc"):0; \ + p=dlsym(lib->w.lib, "xmlMalloc"); \ + my_xmlMalloc = (p && *p)?AddBridge(lib->w.bridge, pFL, *p, 0, "my_wrap_xmlMalloc"):0; \ if(p) *p = my_wrap_xmlMalloc; \ - p=dlsym(lib->priv.w.lib, "xmlRealloc"); \ - my_xmlRealloc = (p && *p)?AddBridge(lib->priv.w.bridge, pFpL, *p, 0, "my_wrap_xmlRealloc"):0; \ + p=dlsym(lib->w.lib, "xmlRealloc"); \ + my_xmlRealloc = (p && *p)?AddBridge(lib->w.bridge, pFpL, *p, 0, "my_wrap_xmlRealloc"):0; \ if(p) *p = my_wrap_xmlRealloc; \ - p=dlsym(lib->priv.w.lib, "xmlMemStrdup"); \ - my_xmlMemStrdup = (p && *p)?AddBridge(lib->priv.w.bridge, pFp, *p, 0, "my_wrap_xmlMemStrdup"):0; \ + p=dlsym(lib->w.lib, "xmlMemStrdup"); \ + my_xmlMemStrdup = (p && *p)?AddBridge(lib->w.bridge, pFp, *p, 0, "my_wrap_xmlMemStrdup"):0; \ if(p) *p = my_wrap_xmlMemStrdup; #include "wrappercallback.h" @@ -1110,12 +1110,12 @@ static void* find_xmlExternalEntityLoaderFct(void* fct) static void* reverse_xmlExternalEntityLoaderFct(void* fct) { if(!fct) return fct; - if(CheckBridged(my_lib->priv.w.bridge, fct)) - return (void*)CheckBridged(my_lib->priv.w.bridge, fct); + if(CheckBridged(my_lib->w.bridge, fct)) + return (void*)CheckBridged(my_lib->w.bridge, fct); #define GO(A) if(my_xmlExternalEntityLoader_##A == fct) return (void*)my_xmlExternalEntityLoader_fct_##A; SUPER() #undef GO - return (void*)AddBridge(my_lib->priv.w.bridge, pFppp, fct, 0, "xmlExternalEntityLoader_callback"); + return (void*)AddBridge(my_lib->w.bridge, pFppp, fct, 0, "xmlExternalEntityLoader_callback"); } |