- warning fixes;

- code cleaning

git-svn-id: http://svn.miranda-ng.org/main/trunk@14757 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 43 insertions, 40 deletions

diff --git a/plugins/SendScreenshotPlus/src/CSendHost_uploadpie.cpp b/plugins/SendScreenshotPlus/src/CSendHost_uploadpie.cpp
index 68aae59b29..e1c44a831a 100644
--- a/plugins/SendScreenshotPlus/src/CSendHost_uploadpie.cpp
+++ b/plugins/SendScreenshotPlus/src/CSendHost_uploadpie.cpp
@@ -16,30 +16,31 @@
 #include "stdafx.h"
 
 CSendHost_UploadPie::CSendHost_UploadPie(HWND Owner, MCONTACT hContact, bool bAsync, int expire)
-	: m_expire(expire), CSend(Owner,hContact,bAsync)
+	: m_expire(expire), CSend(Owner, hContact, bAsync)
 {
-	m_EnableItem=SS_DLG_DESCRIPTION|SS_DLG_AUTOSEND|SS_DLG_DELETEAFTERSSEND;
-	m_pszSendTyp=LPGENT("Image upload");
+	m_EnableItem = SS_DLG_DESCRIPTION | SS_DLG_AUTOSEND | SS_DLG_DELETEAFTERSSEND;
+	m_pszSendTyp = LPGENT("Image upload");
 }
 
 CSendHost_UploadPie::~CSendHost_UploadPie()
-{}
+{
+}
 
 //---------------------------------------------------------------------------
 int CSendHost_UploadPie::Send()
 {
-	if(!g_hNetlibUser){ /// check Netlib
+	if (!g_hNetlibUser) { /// check Netlib
 		Error(SS_ERR_INIT, m_pszSendTyp);
 		Exit(ACKRESULT_FAILED);
 		return !m_bAsync;
 	}
 	memset(&m_nlhr, 0, sizeof(m_nlhr));
-	char* tmp; tmp=mir_t2a(m_pszFile);
-	HTTPFormData frm[]={
-		{"MAX_FILE_SIZE",HTTPFORM_INT(3145728)},// ??
-		{"upload",HTTPFORM_INT(1)},// ??
-		{"uploadedfile",HTTPFORM_FILE(tmp)},
-		{"expire",HTTPFORM_INT(m_expire)},// 30m
+	char* tmp; tmp = mir_t2a(m_pszFile);
+	HTTPFormData frm[] = {
+		{ "MAX_FILE_SIZE", HTTPFORM_INT(3145728) },// ??
+		{ "upload", HTTPFORM_INT(1) },// ??
+		{ "uploadedfile", HTTPFORM_FILE(tmp) },
+		{ "expire", HTTPFORM_INT(m_expire) },// 30m
 		//{"expire",HTTPFORM_INT(2,},// 1h
 		//{"expire",HTTPFORM_INT(3)},// 6h
 		//{"expire",HTTPFORM_INT(4)},// 1d
@@ -47,12 +48,12 @@ int CSendHost_UploadPie::Send()
 		//{"x",HTTPFORM_INT(130)},// ??
 		//{"y",HTTPFORM_INT(17)},// ??
 	};
-	int error=HTTPFormCreate(&m_nlhr,REQUEST_POST,"http://uploadpie.com/",frm,sizeof(frm)/sizeof(HTTPFormData));
+	int error = HTTPFormCreate(&m_nlhr, REQUEST_POST, "http://uploadpie.com/", frm, sizeof(frm) / sizeof(HTTPFormData));
 	mir_free(tmp);
-	if(error)
+	if (error)
 		return !m_bAsync;
 	/// start upload thread
-	if(m_bAsync){
+	if (m_bAsync) {
 		mir_forkthread(&CSendHost_UploadPie::SendThread, this);
 		return 0;
 	}
@@ -62,45 +63,47 @@ int CSendHost_UploadPie::Send()
 
 void CSendHost_UploadPie::SendThread(void* obj)
 {
-	CSendHost_UploadPie* self=(CSendHost_UploadPie*)obj;
+	CSendHost_UploadPie* self = (CSendHost_UploadPie*)obj;
 	/// send DATA and wait for m_nlreply
-	NETLIBHTTPREQUEST* reply=(NETLIBHTTPREQUEST*)CallService(MS_NETLIB_HTTPTRANSACTION,(WPARAM)g_hNetlibUser,(LPARAM)&self->m_nlhr);
+	NETLIBHTTPREQUEST* reply = (NETLIBHTTPREQUEST*)CallService(MS_NETLIB_HTTPTRANSACTION, (WPARAM)g_hNetlibUser, (LPARAM)&self->m_nlhr);
 	self->HTTPFormDestroy(&self->m_nlhr);
-	if(reply){
-		if(reply->resultCode>=200 && reply->resultCode<300 && reply->dataLength){
-			reply->pData[reply->dataLength-1]='\0';/// make sure its null terminated
-			char* url=reply->pData;
-			do{
+	if (reply) {
+		if (reply->resultCode >= 200 && reply->resultCode < 300 && reply->dataLength) {
+			reply->pData[reply->dataLength - 1] = '\0';/// make sure its null terminated
+			char* url = reply->pData;
+			do {
 				char* pos;
-				if((url=strstr(url,"http://uploadpie.com/"))){
-					for(pos=url+21; (*pos>='0'&&*pos<='9') || (*pos>='a'&&*pos<='z') || (*pos>='A'&&*pos<='Z') || *pos=='_' || *pos=='-' || *pos=='"' || *pos=='\''; ++pos){
-						if(*pos=='"' || *pos=='\'') break;
+				if ((url = strstr(url, "http://uploadpie.com/"))) {
+					for (pos = url + 21; (*pos >= '0'&&*pos <= '9') || (*pos >= 'a'&&*pos <= 'z') || (*pos >= 'A'&&*pos <= 'Z') || *pos == '_' || *pos == '-' || *pos == '"' || *pos == '\''; ++pos) {
+						if (*pos == '"' || *pos == '\'') break;
 					}
-					if(url+21!=pos && (*pos=='"' || *pos=='\'')){
-						*pos='\0';
+					if (url + 21 != pos && (*pos == '"' || *pos == '\'')) {
+						*pos = '\0';
 						break;
 					}
 					++url;
 				}
-			}while(url);
-			if(url){
-				mir_free(self->m_URL), self->m_URL=mir_strdup(url);
-				CallService(MS_NETLIB_FREEHTTPREQUESTSTRUCT,0,(LPARAM)reply);
+			} while (url);
+			
+			if (url) {
+				mir_free(self->m_URL), self->m_URL = mir_strdup(url);
+				CallService(MS_NETLIB_FREEHTTPREQUESTSTRUCT, 0, (LPARAM)reply);
 				self->svcSendMsgExit(url); return;
-			}else{/// check error mess from server
-				const char* err=GetHTMLContent(reply->pData,"<p id=\"error\"","</p>");
+			}
+			else {/// check error mess from server
+				const char* err = GetHTMLContent(reply->pData, "<p id=\"error\"", "</p>");
 				TCHAR* werr;
-				if(err) werr=mir_a2t(err);
-				else werr=mir_a2t(reply->pData);
-				self->Error(_T("%s"),werr);
+				if (err) werr = mir_a2t(err);
+				else werr = mir_a2t(reply->pData);
+				self->Error(_T("%s"), werr);
 				mir_free(werr);
 			}
-		}else{
-			self->Error(SS_ERR_RESPONSE,self->m_pszSendTyp,reply->resultCode);
 		}
-		CallService(MS_NETLIB_FREEHTTPREQUESTSTRUCT,0,(LPARAM)reply);
-	}else{
-		self->Error(SS_ERR_NORESPONSE,self->m_pszSendTyp,self->m_nlhr.resultCode);
+		else self->Error(SS_ERR_RESPONSE, self->m_pszSendTyp, reply->resultCode);
+
+		CallService(MS_NETLIB_FREEHTTPREQUESTSTRUCT, 0, (LPARAM)reply);
 	}
+	else self->Error(SS_ERR_NORESPONSE, self->m_pszSendTyp, self->m_nlhr.resultCode);
+
 	self->Exit(ACKRESULT_FAILED);
 }