From 25221b7d2afb70f82eb3805330fd39a6f6708049 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 26 Jun 2012 23:41:55 +0000 Subject: mk: removed all LIST_INTERFACE, MI_INTERFACE & UTF8_INTERFACE instances. all related functions moved to mir_core. git-svn-id: http://svn.miranda-ng.org/main/trunk@644 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Variables/tokenregister.cpp | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'plugins/Variables/tokenregister.cpp') diff --git a/plugins/Variables/tokenregister.cpp b/plugins/Variables/tokenregister.cpp index 54a40a5147..50c81ddad8 100644 --- a/plugins/Variables/tokenregister.cpp +++ b/plugins/Variables/tokenregister.cpp @@ -18,8 +18,6 @@ */ #include "variables.h" -extern struct LIST_INTERFACE li; - typedef struct { TOKENREGISTEREX tr; DWORD nameHash; @@ -50,7 +48,7 @@ static TokenRegisterEntry* FindTokenRegisterByName(TCHAR *name) temp.nameHash = NameHashFunction( name ); if ( List_GetIndex(( SortedList* )&tokens, &temp, &idx )) return tokens.items[ idx ]; - + return NULL; } @@ -68,12 +66,12 @@ int registerIntToken(TCHAR *szToken, TCHAR *(*parseFunction)(ARGUMENTSINFO *ai), } int deRegisterToken(TCHAR *token) { - + TokenRegisterEntry *tre; - + if (token == NULL) { return -1; - } + } EnterCriticalSection(&csRegister); tre = FindTokenRegisterByName( token ); if ( tre == NULL ) { @@ -131,7 +129,7 @@ INT_PTR registerToken(WPARAM wParam, LPARAM lParam) memcpy( &tre->tr, newVr, newVr->cbSize ); tre->nameHash = hash; - if ( !_tcscmp( newVr->tszTokenString, _T("alias"))) + if ( !_tcscmp( newVr->tszTokenString, _T("alias"))) log_debugA("alias"); if ( !( newVr->flags & TRF_PARSEFUNC ) && newVr->szService != NULL ) @@ -182,7 +180,7 @@ TCHAR *parseFromRegister(ARGUMENTSINFO *ai) int callRes; TCHAR *temp, *res; TOKENREGISTEREX *thisVr, trCopy; - + if ( (ai == NULL) || (ai->argc == 0) || (ai->targv[0] == NULL)) { return NULL; } @@ -206,7 +204,7 @@ TCHAR *parseFromRegister(ARGUMENTSINFO *ai) // unicode variables calls a non-unicode plugin unsigned int j; ARGUMENTSINFO cAi; - + memcpy(&cAi, ai, sizeof(ARGUMENTSINFO)); cAi.argv = ( char** )malloc(ai->argc*sizeof(char *)); for ( j=0; j < ai->argc; j++ ) @@ -257,7 +255,7 @@ TCHAR *parseFromRegister(ARGUMENTSINFO *ai) TOKENREGISTEREX* getTokenRegister( int i ) { TOKENREGISTEREX *retVr; - + EnterCriticalSection(&csRegister); retVr = ( i >= tokens.count || i < 0 ) ? NULL : &tokens.items[i]->tr; LeaveCriticalSection( &csRegister ); -- cgit v1.2.3