c/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2 synced 2025-03-28 21:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use memcpy to avoid pointer cast warnings

Browse Source
This commit is contained in:
Nick Wellnhofer 2025-03-04 18:42:35 +01:00
parent d9ea76505d
commit 03be993ce5
5 changed files with 21 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
include/libxml/xmlexports.h
View File

@ -77,43 +77,6 @@
#endif #endif
#endif #endif
/*
* Warnings pragmas, should be moved from public headers
*/
#if defined(__LCC__)
#define XML_IGNORE_FPTR_CAST_WARNINGS
#define XML_POP_WARNINGS \
_Pragma("diag_default 1215")
#elif defined(__clang__) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 406)
#if defined(__clang__) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 800)
#define XML_IGNORE_FPTR_CAST_WARNINGS \
_Pragma("GCC diagnostic push") \
_Pragma("GCC diagnostic ignored \"-Wpedantic\"") \
_Pragma("GCC diagnostic ignored \"-Wcast-function-type\"")
#else
#define XML_IGNORE_FPTR_CAST_WARNINGS \
_Pragma("GCC diagnostic push") \
_Pragma("GCC diagnostic ignored \"-Wpedantic\"")
#endif
#define XML_POP_WARNINGS \
_Pragma("GCC diagnostic pop")
#elif defined(_MSC_VER) && _MSC_VER >= 1400
#define XML_IGNORE_FPTR_CAST_WARNINGS __pragma(warning(push))
#define XML_POP_WARNINGS __pragma(warning(pop))
#else
#define XML_IGNORE_FPTR_CAST_WARNINGS
#define XML_POP_WARNINGS
#endif
/* /*
* Originally declared in xmlversion.h which is generated * Originally declared in xmlversion.h which is generated
*/ */

15
python/libxml_wrap.h
View File

@ -65,19 +65,22 @@
* Macros to ignore deprecation warnings * Macros to ignore deprecation warnings
*/ */
#if defined(__LCC__) #if defined(__LCC__)
#define XML_IGNORE_DEPRECATION_WARNINGS \ #define XML_IGNORE_DEPRECATION_WARNINGS _Pragma("diag_suppress 1215")
_Pragma("diag_suppress 1215") #define XML_POP_WARNINGS _Pragma("diag_default 1215")
#elif defined(__clang__) || \ #elif defined(__clang__) || \
(defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 406)) (defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 406))
#define XML_IGNORE_DEPRECATION_WARNINGS \ #define XML_IGNORE_DEPRECATION_WARNINGS \
_Pragma("GCC diagnostic push") \ _Pragma("GCC diagnostic push") \
_Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"") _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
#define XML_POP_WARNINGS _Pragma("GCC diagnostic pop")
#elif defined (_MSC_VER) && (_MSC_VER >= 1400) #elif defined (_MSC_VER) && (_MSC_VER >= 1400)
#define XML_IGNORE_DEPRECATION_WARNINGS \ #define XML_IGNORE_DEPRECATION_WARNINGS \
__pragma(warning(push)) \ __pragma(warning(push)) \
__pragma(warning(disable : 4996)) __pragma(warning(disable : 4996))
#define XML_POP_WARNINGS __pragma(warning(pop))
#else #else
#define XML_IGNORE_DEPRECATION_WARNINGS #define XML_IGNORE_DEPRECATION_WARNINGS
#define XML_POP_WARNINGS
#endif #endif
#define PyxmlNode_Get(v) (((v) == Py_None) ? NULL : \ #define PyxmlNode_Get(v) (((v) == Py_None) ? NULL : \

5
python/types.c
View File

@ -112,9 +112,8 @@ libxml_PyFileGet(PyObject *f) {
if (hntdll == NULL) if (hntdll == NULL)
return(NULL); return(NULL);
XML_IGNORE_FPTR_CAST_WARNINGS NtQueryInformationFile = (t_NtQueryInformationFile) (void (*)(void))
NtQueryInformationFile = (t_NtQueryInformationFile)GetProcAddress(hntdll, "NtQueryInformationFile"); GetProcAddress(hntdll, "NtQueryInformationFile");
XML_POP_WARNINGS
if (NtQueryInformationFile != NULL && if (NtQueryInformationFile != NULL &&
(NtQueryInformationFile((HANDLE)w_fh, (NtQueryInformationFile((HANDLE)w_fh,

6
xmlmodule.c
View File

@ -289,10 +289,10 @@ xmlModulePlatformClose(void *handle)
static int static int
xmlModulePlatformSymbol(void *handle, const char *name, void **symbol) xmlModulePlatformSymbol(void *handle, const char *name, void **symbol)
{ {
XML_IGNORE_FPTR_CAST_WARNINGS FARPROC proc = GetProcAddress(handle, name);
*symbol = GetProcAddress(handle, name);
memcpy(symbol, &proc, sizeof(proc));
return (NULL == *symbol) ? -1 : 0; return (NULL == *symbol) ? -1 : 0;
XML_POP_WARNINGS
} }
#endif /* _WIN32 */ #endif /* _WIN32 */

13
xpath.c
View File

@ -3819,6 +3819,7 @@ int
xmlXPathRegisterFuncNS(xmlXPathContextPtr ctxt, const xmlChar *name, xmlXPathRegisterFuncNS(xmlXPathContextPtr ctxt, const xmlChar *name,
const xmlChar *ns_uri, xmlXPathFunction f) { const xmlChar *ns_uri, xmlXPathFunction f) {
int ret; int ret;
void *payload;
if (ctxt == NULL) if (ctxt == NULL)
return(-1); return(-1);
@ -3833,9 +3834,8 @@ xmlXPathRegisterFuncNS(xmlXPathContextPtr ctxt, const xmlChar *name,
} }
if (f == NULL) if (f == NULL)
return(xmlHashRemoveEntry2(ctxt->funcHash, name, ns_uri, NULL)); return(xmlHashRemoveEntry2(ctxt->funcHash, name, ns_uri, NULL));
XML_IGNORE_FPTR_CAST_WARNINGS memcpy(&payload, &f, sizeof(f));
ret = xmlHashAddEntry2(ctxt->funcHash, name, ns_uri, (void *) f); ret = xmlHashAddEntry2(ctxt->funcHash, name, ns_uri, payload);
XML_POP_WARNINGS
if (ret < 0) { if (ret < 0) {
xmlXPathErrMemory(ctxt); xmlXPathErrMemory(ctxt);
return(-1); return(-1);
@ -3892,6 +3892,7 @@ xmlXPathFunction
xmlXPathFunctionLookupNS(xmlXPathContextPtr ctxt, const xmlChar *name, xmlXPathFunctionLookupNS(xmlXPathContextPtr ctxt, const xmlChar *name,
const xmlChar *ns_uri) { const xmlChar *ns_uri) {
xmlXPathFunction ret; xmlXPathFunction ret;
void *payload;
if (ctxt == NULL) if (ctxt == NULL)
return(NULL); return(NULL);
@ -3926,9 +3927,9 @@ xmlXPathFunctionLookupNS(xmlXPathContextPtr ctxt, const xmlChar *name,
if (ctxt->funcHash == NULL) if (ctxt->funcHash == NULL)
return(NULL); return(NULL);
XML_IGNORE_FPTR_CAST_WARNINGS payload = xmlHashLookup2(ctxt->funcHash, name, ns_uri);
ret = (xmlXPathFunction) xmlHashLookup2(ctxt->funcHash, name, ns_uri); memcpy(&ret, &payload, sizeof(payload));
XML_POP_WARNINGS
return(ret); return(ret);
} }