Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make PL_InitEvent callers stop doing potentially dangerous casting of function pointers. b=305278 r=dougt sr=darin

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@184589 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dbaron%dbaron.org
2005-11-14 20:09:51 +00:00
parent ad69dfbd5c
commit ea56e835a3
25 changed files with 174 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mozilla/modules/plugin/samples/SanePlugin/nsSanePlugin.cpp
View File

@@ -76,7 +76,7 @@ struct my_JPEG_error_mgr
typedef struct my_JPEG_error_mgr *emptr;
static void PR_CALLBACK ThreadedDestroyEvent(PLEvent* aEvent);
static void PR_CALLBACK ThreadedHandleEvent(PLEvent* aEvent);
static void* PR_CALLBACK ThreadedHandleEvent(PLEvent* aEvent);
//static void PR_CALLBACK scanimage_thread_routine( void * arg );
@@ -2550,10 +2550,7 @@ void PR_CALLBACK scanimage_thread_routine( void * arg )
}
// ThreadHandleEvent will now execute in the UI thread.
PL_InitEvent(event,
pthis,
(PLHandleEventProc) ThreadedHandleEvent,
(PLDestroyEventProc) ThreadedDestroyEvent);
PL_InitEvent(event, pthis, ThreadedHandleEvent, ThreadedDestroyEvent);
if (NS_FAILED(eventQ->PostEvent(event))) {
NS_ERROR("Error trying to post event!\n");
@@ -2562,7 +2559,7 @@ void PR_CALLBACK scanimage_thread_routine( void * arg )
}
}
void PR_CALLBACK ThreadedHandleEvent(PLEvent * event)
void* PR_CALLBACK ThreadedHandleEvent(PLEvent * event)
{
nsSanePluginInstance *pthis = (nsSanePluginInstance *)event->owner;
@@ -2577,6 +2574,8 @@ void PR_CALLBACK ThreadedHandleEvent(PLEvent * event)
// Notify user that routine is finished
pthis->DoScanCompleteCallback();
return nsnull;
}
void PR_CALLBACK ThreadedDestroyEvent(PLEvent* aEvent)