From 3e9e96f6718b13c069138fb40f24f065ac03c6b7 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 18 Sep 2017 18:33:09 +0300 Subject: unneeded calls of DestroyServiceFunction() removed --- plugins/Variables/src/variables.cpp | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) (limited to 'plugins/Variables/src') diff --git a/plugins/Variables/src/variables.cpp b/plugins/Variables/src/variables.cpp index a6db523926..d5d9690372 100644 --- a/plugins/Variables/src/variables.cpp +++ b/plugins/Variables/src/variables.cpp @@ -20,14 +20,6 @@ #include "stdafx.h" /* some handles */ -static HANDLE - hFormatStringService, - hRegisterVariableService, - hGetMMIService, - hShowHelpService, - hShowHelpExService, - hGetIconService; - static HANDLE hOptionsHook = NULL, hIconsChangedHook = NULL; @@ -422,19 +414,19 @@ int LoadVarModule() return -1; setParseOptions(NULL); - hFormatStringService = CreateServiceFunction(MS_VARS_FORMATSTRING, formatStringService); - hRegisterVariableService = CreateServiceFunction(MS_VARS_REGISTERTOKEN, registerToken); + CreateServiceFunction(MS_VARS_FORMATSTRING, formatStringService); + CreateServiceFunction(MS_VARS_REGISTERTOKEN, registerToken); // help dialog hCurSplitNS = LoadCursor(NULL, IDC_SIZENS); - hShowHelpService = CreateServiceFunction(MS_VARS_SHOWHELP, showHelpService); - hShowHelpExService = CreateServiceFunction(MS_VARS_SHOWHELPEX, showHelpExService); + CreateServiceFunction(MS_VARS_SHOWHELP, showHelpService); + CreateServiceFunction(MS_VARS_SHOWHELPEX, showHelpExService); Icon_Register(hInst, LPGEN("Variables"), &icon, 1); hIconsChangedHook = HookEvent(ME_SKIN2_ICONSCHANGED, iconsChanged); - hGetIconService = CreateServiceFunction(MS_VARS_GETSKINITEM, getSkinItemService); + CreateServiceFunction(MS_VARS_GETSKINITEM, getSkinItemService); hOptionsHook = HookEvent(ME_OPT_INITIALISE, OptionsInit); // register internal tokens @@ -472,12 +464,6 @@ int UnloadVarModule() if (hIconsChangedHook != NULL) UnhookEvent(hIconsChangedHook); - DestroyServiceFunction(hRegisterVariableService); - DestroyServiceFunction(hFormatStringService); - DestroyServiceFunction(hGetMMIService); - DestroyServiceFunction(hShowHelpService); - DestroyServiceFunction(hShowHelpExService); - DestroyServiceFunction(hGetIconService); DestroyCursor(hCurSplitNS); deinitContactModule(); deinitTokenRegister(); -- cgit v1.2.3