From 995d9bcf3ef85618ac6bc44e3b0543f9e357e661 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 29 Aug 2015 17:51:10 +0000 Subject: oops... some more 'hides' warnings git-svn-id: http://svn.miranda-ng.org/main/trunk@15100 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Tlen/src/tlen_picture.cpp | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) (limited to 'protocols/Tlen/src/tlen_picture.cpp') diff --git a/protocols/Tlen/src/tlen_picture.cpp b/protocols/Tlen/src/tlen_picture.cpp index 840bc0134c..7279e831d2 100644 --- a/protocols/Tlen/src/tlen_picture.cpp +++ b/protocols/Tlen/src/tlen_picture.cpp @@ -46,40 +46,32 @@ static void TlenPsPostThread(void *ptr) { BOOL bSent = FALSE; if (socket != NULL) { char header[512]; - DWORD ret; item->ft->s = socket; item->ft->hFileEvent = CreateEvent(NULL, FALSE, FALSE, NULL); - ret = mir_snprintf(header, "", proto->threadData->username, item->ft->jid, item->ft->fileTotalSize, item->jid); - TlenWsSend(proto, socket, header, (int)ret); + int ret = mir_snprintf(header, "", proto->threadData->username, item->ft->jid, item->ft->fileTotalSize, item->jid); + TlenWsSend(proto, socket, header, ret); ret = WaitForSingleObject(item->ft->hFileEvent, 1000 * 60 * 5); if (ret == WAIT_OBJECT_0) { FILE *fp = fopen( item->ft->files[0], "rb" ); if (fp) { - int i; - char header[512]; char fileBuffer[2048]; - i = mir_snprintf(header, "", item->ft->iqId, item->jid); - TlenWsSend(proto, socket, header, i); + ret = mir_snprintf(header, "", item->ft->iqId, item->jid); + TlenWsSend(proto, socket, header, ret); proto->debugLogA("Sending picture data..."); - for (i = item->ft->filesSize[0]; i > 0; ) { + for (int i = item->ft->filesSize[0]; i > 0; ) { int toread = min(2048, i); int readcount = (int)fread(fileBuffer, (size_t)1, (size_t)toread, fp); i -= readcount; - if (readcount > 0) { + if (readcount > 0) TlenWsSend(proto, socket, fileBuffer, readcount); - } - if (toread != readcount) { + + if (toread != readcount) break; - } } fclose(fp); SleepEx(3000, TRUE); bSent = TRUE; - } else { - /* picture not found */ } - } else { - /* 5 minutes passed */ } Netlib_CloseHandle(socket); if (bSent) { @@ -88,9 +80,8 @@ static void TlenPsPostThread(void *ptr) { } TlenP2PFreeFileTransfer(item->ft); TlenListRemove(proto, LIST_PICTURE, item->jid); - } else { - /* cannot connect to ps server */ } + mir_free(data); } -- cgit v1.2.3