← Back to team overview

linuxdcpp-team team mailing list archive

[Branch ~dcplusplus-team/dcplusplus/trunk] Rev 2987: switch void* to dc_ptr

 

------------------------------------------------------------
revno: 2987
committer: cologic <ne5@xxxxxxxxxxx>
branch nick: dcplusplus
timestamp: Sun 2012-07-08 01:20:00 -0400
message:
  switch void* to dc_ptr
modified:
  dcpp/PluginDefs.h
  plugins/SamplePlugin/Plugin.c
  plugins/SamplePlugin/Plugin.h


--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk

Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription
=== modified file 'dcpp/PluginDefs.h'
--- dcpp/PluginDefs.h	2012-07-08 03:48:50 +0000
+++ dcpp/PluginDefs.h	2012-07-08 05:20:00 +0000
@@ -280,7 +280,7 @@
 /* Hooks (events) system - required interface! */
 
 /* Hook function prototypes */
-typedef Bool (DCAPI* DCHOOK)		(dcptr_t pObject, dcptr_t pData, void* pCommon, Bool* bBreak);
+typedef Bool (DCAPI* DCHOOK)		(dcptr_t pObject, dcptr_t pData, dcptr_t pCommon, Bool* bBreak);
 
 /* Hook system functions */
 typedef struct tagDCHooks {

=== modified file 'plugins/SamplePlugin/Plugin.c'
--- plugins/SamplePlugin/Plugin.c	2012-07-08 03:48:50 +0000
+++ plugins/SamplePlugin/Plugin.c	2012-07-08 05:20:00 +0000
@@ -103,7 +103,7 @@
 }
 
 /* Event handlers */
-Bool DCAPI onHubEnter(dcptr_t pObject, dcptr_t pData, void *opaque, Bool* bBreak) {
+Bool DCAPI onHubEnter(dcptr_t pObject, dcptr_t pData, dcptr_t opaque, Bool* bBreak) {
 	HubDataPtr hHub = (HubDataPtr)pObject;
 	CommandDataPtr cmd = (CommandDataPtr)pData;
 
@@ -189,7 +189,7 @@
 	return False;
 }
 
-Bool DCAPI onHubOnline(dcptr_t pObject, dcptr_t pData, void *opaque, Bool* bBreak) {
+Bool DCAPI onHubOnline(dcptr_t pObject, dcptr_t pData, dcptr_t opaque, Bool* bBreak) {
 	HubDataPtr hHub = (HubDataPtr)pObject;
 
 	char* buf = (char*)memset(malloc(256), 0, 256);

=== modified file 'plugins/SamplePlugin/Plugin.h'
--- plugins/SamplePlugin/Plugin.h	2012-07-08 03:48:50 +0000
+++ plugins/SamplePlugin/Plugin.h	2012-07-08 05:20:00 +0000
@@ -35,8 +35,8 @@
 void DCAPI set_cfg_int64(const char* name, int64_t value);
 
 /* Event handlers */
-Bool DCAPI onHubEnter(dcptr_t pObject, dcptr_t pData, void *opaque, Bool* bBreak);
-Bool DCAPI onHubOnline(dcptr_t pObject, dcptr_t pData, void *opaque, Bool* bBreak);
+Bool DCAPI onHubEnter(dcptr_t pObject, dcptr_t pData, dcptr_t opaque, Bool* bBreak);
+Bool DCAPI onHubOnline(dcptr_t pObject, dcptr_t pData, dcptr_t opaque, Bool* bBreak);
 
 /* Plugin main function */
 Bool DCAPI pluginMain(PluginState state, DCCorePtr core, dcptr_t pData);