Skip to content

CoreFoundation: explicitly cast to the proper fptr types #4689

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 19, 2023
Merged

CoreFoundation: explicitly cast to the proper fptr types #4689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CoreFoundation/Parsing.subproj/CFXMLInterface.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1125,7 +1125,7 @@ _CFXMLDTDPtr _CFXMLNewDTD(_CFXMLDocPtr doc, const unsigned char* name, const uns
return xmlNewDtd(doc, name, publicID, systemID);
}

void _CFXMLNotationScanner(void* payload, void* data, xmlChar* name) {
void _CFXMLNotationScanner(void* payload, void* data, const xmlChar* name) {
xmlNotationPtr notation = (xmlNotationPtr)payload;
_cfxmlNotation* node = (_cfxmlNotation*)data;
node->type = XML_NOTATION_NODE;
Expand All @@ -1147,7 +1147,7 @@ _CFXMLDTDNodePtr _CFXMLParseDTDNode(const unsigned char* xmlString) {
xmlUnlinkNode(node);
} else if (dtd->notations) {
node = (xmlNodePtr)calloc(1, sizeof(_cfxmlNotation));
xmlHashScan((xmlNotationTablePtr)dtd->notations, &_CFXMLNotationScanner, (void*)node);
xmlHashScan((xmlNotationTablePtr)dtd->notations, &_CFXMLNotationScanner, node);
}

return node;
Expand Down
2 changes: 1 addition & 1 deletion CoreFoundation/RunLoop.subproj/CFRunLoop.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1769,7 +1769,7 @@ CF_EXPORT CFRunLoopRef _CFRunLoopGet0(_CFThreadRef t) {
#if _POSIX_THREADS
_CFSetTSD(__CFTSDKeyRunLoopCntr, (void *)(PTHREAD_DESTRUCTOR_ITERATIONS-1), (void (*)(void *))__CFFinalizeRunLoop);
#else
_CFSetTSD(__CFTSDKeyRunLoopCntr, 0, &__CFFinalizeRunLoop);
_CFSetTSD(__CFTSDKeyRunLoopCntr, 0, (void (* _Nullable)(void * _Nullable))&__CFFinalizeRunLoop);
#endif
}
}
Expand Down