diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/modules/json/libJSON.cpp | 7 | ||||
| -rw-r--r-- | src/modules/netlib/netliblog.cpp | 2 | ||||
| -rw-r--r-- | src/modules/netlib/netlibsock.cpp | 4 | ||||
| -rw-r--r-- | src/modules/plugins/pluginopts.cpp | 4 |
4 files changed, 8 insertions, 9 deletions
diff --git a/src/modules/json/libJSON.cpp b/src/modules/json/libJSON.cpp index a84d7bf7c0..0312898299 100644 --- a/src/modules/json/libJSON.cpp +++ b/src/modules/json/libJSON.cpp @@ -195,9 +195,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. JSONNODE * json_new_b(const json_char * name, int value){ JSON_ASSERT_SAFE(name, JSON_TEXT("null name to json_new_b"), name = EMPTY_CSTRING;); #ifdef JSON_MEMORY_CALLBACKS - return MANAGER_INSERT(new(json_malloc<JSONNode>(1)) JSONNode(name, (bool)value)); + return MANAGER_INSERT(new(json_malloc<JSONNode>(1)) JSONNode(name, value != 0 )); #else - return MANAGER_INSERT(new JSONNode(name, (bool)value)); + return MANAGER_INSERT(new JSONNode(name, (bool)value)) != 0; #endif } @@ -242,7 +242,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. void json_set_b(JSONNODE * node, int value){ JSON_ASSERT_SAFE(node, JSON_TEXT("null node to json_set_b"), return;); - *((JSONNode*)node) = (bool)value; + *((JSONNode*)node) = value != 0; } void json_set_n(JSONNODE * node, const JSONNODE * orig){ @@ -251,7 +251,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *((JSONNode*)node) = *((JSONNode*)orig); } - //inspectors char json_type(const JSONNODE * node){ JSON_ASSERT_SAFE(node, JSON_TEXT("null node to json_type"), return JSON_NULL;); diff --git a/src/modules/netlib/netliblog.cpp b/src/modules/netlib/netliblog.cpp index 3e1265d4dd..5e312b9133 100644 --- a/src/modules/netlib/netliblog.cpp +++ b/src/modules/netlib/netliblog.cpp @@ -398,7 +398,7 @@ static INT_PTR NetlibLog(WPARAM wParam, LPARAM lParam) }
LOGMSG logMsg = { szHead, pszMsg };
- CallHookSubscribers(hLogEvent, (WPARAM)nlu, (LPARAM)&logMsg);
+ NotifyEventHooks(hLogEvent, (WPARAM)nlu, (LPARAM)&logMsg);
SetLastError(dwOriginalLastError);
return 1;
diff --git a/src/modules/netlib/netlibsock.cpp b/src/modules/netlib/netlibsock.cpp index 30db9ce256..badc1fe0ca 100644 --- a/src/modules/netlib/netlibsock.cpp +++ b/src/modules/netlib/netlibsock.cpp @@ -59,7 +59,7 @@ INT_PTR NetlibSend(WPARAM wParam, LPARAM lParam) NetlibLeaveNestedCS(&nlc->ncsSend);
NETLIBNOTIFY nln = { nlb, result };
- CallHookSubscribers(hSendEvent, (WPARAM)&nln, (LPARAM)&nlc->nlu->user);
+ NotifyEventHooks(hSendEvent, (WPARAM)&nln, (LPARAM)&nlc->nlu->user);
return result;
}
@@ -95,7 +95,7 @@ INT_PTR NetlibRecv(WPARAM wParam, LPARAM lParam) if ((nlb->flags & MSG_PEEK) == 0) {
NETLIBNOTIFY nln = { nlb, recvResult };
- CallHookSubscribers(hRecvEvent, (WPARAM)&nln, (LPARAM)&nlc->nlu->user);
+ NotifyEventHooks(hRecvEvent, (WPARAM)&nln, (LPARAM)&nlc->nlu->user);
}
return recvResult;
}
diff --git a/src/modules/plugins/pluginopts.cpp b/src/modules/plugins/pluginopts.cpp index a62dc08378..83a3c2f4c5 100644 --- a/src/modules/plugins/pluginopts.cpp +++ b/src/modules/plugins/pluginopts.cpp @@ -167,7 +167,7 @@ LBL_Error: goto LBL_Error;
dat->hInst = pPlug->bpi.hInst;
- CallHookSubscribers(hevLoadModule, (WPARAM)pPlug->bpi.InfoEx, (LPARAM)pPlug->bpi.hInst);
+ NotifyEventHooks(hevLoadModule, (WPARAM)pPlug->bpi.InfoEx, (LPARAM)pPlug->bpi.hInst);
return TRUE;
}
@@ -184,7 +184,7 @@ static int UnloadPluginDynamically(PluginListItemData* dat) if (CallPluginEventHook(pPlug->bpi.hInst, hOkToExitEvent, 0, 0) != 0)
return FALSE;
- CallHookSubscribers(hevUnloadModule, (WPARAM)pPlug->bpi.InfoEx, (LPARAM)pPlug->bpi.hInst);
+ NotifyEventHooks(hevUnloadModule, (WPARAM)pPlug->bpi.InfoEx, (LPARAM)pPlug->bpi.hInst);
CallPluginEventHook(pPlug->bpi.hInst, hPreShutdownEvent, 0, 0);
CallPluginEventHook(pPlug->bpi.hInst, hShutdownEvent, 0, 0);
|