From 25221b7d2afb70f82eb3805330fd39a6f6708049 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
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/MirOTR/MirOTR/dllmain.cpp            | 4 ----
 plugins/MirOTR/MirOTR/otr.cpp                | 2 +-
 plugins/MirOTR/MirOTR/svcs_proto.cpp         | 2 +-
 plugins/MirOTR/libgcrypt-1.4.6/cipher/md5.c  | 4 ++--
 plugins/MirOTR/libgcrypt-1.4.6/cipher/sha1.c | 6 +++---
 5 files changed, 7 insertions(+), 11 deletions(-)

(limited to 'plugins/MirOTR')

diff --git a/plugins/MirOTR/MirOTR/dllmain.cpp b/plugins/MirOTR/MirOTR/dllmain.cpp
index f5b9fb3fe9..dae2e0b959 100644
--- a/plugins/MirOTR/MirOTR/dllmain.cpp
+++ b/plugins/MirOTR/MirOTR/dllmain.cpp
@@ -8,8 +8,6 @@
 HANDLE hEventWindow;
 HINSTANCE hInst;
 PLUGINLINK *pluginLink;
-MM_INTERFACE mmi;
-UTF8_INTERFACE utfi;
 int hLangpack;
 char* g_metaproto;
 
@@ -136,8 +134,6 @@ DLLFUNC int Load(PLUGINLINK *link)
 	DEBUGOUT_T("LOAD MIROTR")
 	pluginLink=link;
 	mir_getLP( &pluginInfo );
-	mir_getMMI(&mmi);
-	mir_getUTFI(&utfi);
 	/* for timezones
 	 mir_getTMI(&tmi);  */
 	
diff --git a/plugins/MirOTR/MirOTR/otr.cpp b/plugins/MirOTR/MirOTR/otr.cpp
index dfc5575fa4..380bc891c3 100644
--- a/plugins/MirOTR/MirOTR/otr.cpp
+++ b/plugins/MirOTR/MirOTR/otr.cpp
@@ -163,7 +163,7 @@ extern "C" {
 		TCHAR* title_t = mir_utf8decodeT(title);
 		TCHAR *notify = TranslateT(LANG_OTR_NOTIFY);
 		
-		int len = _tcslen(uname) + _tcslen(title_t) + _tcslen(notify);
+		size_t len = _tcslen(uname) + _tcslen(title_t) + _tcslen(notify);
 		TCHAR *buff1 = new TCHAR[len];
 		mir_sntprintf(buff1, len, notify, TranslateTS(title_t), uname);
 		mir_free(title_t);
diff --git a/plugins/MirOTR/MirOTR/svcs_proto.cpp b/plugins/MirOTR/MirOTR/svcs_proto.cpp
index 1124d5c797..d20ef4d896 100644
--- a/plugins/MirOTR/MirOTR/svcs_proto.cpp
+++ b/plugins/MirOTR/MirOTR/svcs_proto.cpp
@@ -352,7 +352,7 @@ INT_PTR SVC_OTRRecvMessage(WPARAM wParam,LPARAM lParam){
 								}
 							
 								if (options.prefix_messages) {
-									DWORD len = (strlen(options.prefix)+strlen(newmessage)+1)*sizeof(char);
+									size_t len = (strlen(options.prefix)+strlen(newmessage)+1)*sizeof(char);
 									premsg = (char*)mir_alloc( len );
 									memset(premsg, 0, len);
 									strcpy(premsg, options.prefix);
diff --git a/plugins/MirOTR/libgcrypt-1.4.6/cipher/md5.c b/plugins/MirOTR/libgcrypt-1.4.6/cipher/md5.c
index 899dce89ad..aaf02a8f14 100644
--- a/plugins/MirOTR/libgcrypt-1.4.6/cipher/md5.c
+++ b/plugins/MirOTR/libgcrypt-1.4.6/cipher/md5.c
@@ -52,7 +52,7 @@ typedef struct {
 
 
 static void
-md5_init( void *context )
+mir_md5_init( void *context )
 {
   MD5_CONTEXT *ctx = context;
 
@@ -350,6 +350,6 @@ static gcry_md_oid_spec_t oid_spec_md5[] =
 gcry_md_spec_t _gcry_digest_spec_md5 =
   {
     "MD5", asn, DIM (asn), oid_spec_md5, 16,
-    md5_init, md5_write, md5_final, md5_read,
+    mir_md5_init, md5_write, md5_final, md5_read,
     sizeof (MD5_CONTEXT)
   };
diff --git a/plugins/MirOTR/libgcrypt-1.4.6/cipher/sha1.c b/plugins/MirOTR/libgcrypt-1.4.6/cipher/sha1.c
index 8862c64b0a..67cbaff3b3 100644
--- a/plugins/MirOTR/libgcrypt-1.4.6/cipher/sha1.c
+++ b/plugins/MirOTR/libgcrypt-1.4.6/cipher/sha1.c
@@ -66,7 +66,7 @@ typedef struct
 
 
 static void
-sha1_init (void *context)
+mir_sha1_init (void *context)
 {
   SHA1_CONTEXT *hd = context;
 
@@ -367,7 +367,7 @@ _gcry_sha1_hash_buffer (void *outbuf, const void *buffer, size_t length)
 {
   SHA1_CONTEXT hd;
 
-  sha1_init (&hd);
+  mir_sha1_init (&hd);
   sha1_write (&hd, buffer, length);
   sha1_final (&hd);
   memcpy (outbuf, hd.buf, 20);
@@ -469,7 +469,7 @@ static gcry_md_oid_spec_t oid_spec_sha1[] =
 gcry_md_spec_t _gcry_digest_spec_sha1 =
   {
     "SHA1", asn, DIM (asn), oid_spec_sha1, 20,
-    sha1_init, sha1_write, sha1_final, sha1_read,
+    mir_sha1_init, sha1_write, sha1_final, sha1_read,
     sizeof (SHA1_CONTEXT)
   };
 md_extra_spec_t _gcry_digest_extraspec_sha1 = 
-- 
cgit v1.2.3