mir_snprintf(..., sizeof() -> SIZEOF(), ...)

small fixs cleanups



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

6 files changed, 28 insertions, 28 deletions

diff --git a/plugins/FTPFileYM/src/job_delete.cpp b/plugins/FTPFileYM/src/job_delete.cpp
index 8d0447c398..a5310c82d6 100644
--- a/plugins/FTPFileYM/src/job_delete.cpp
+++ b/plugins/FTPFileYM/src/job_delete.cpp
@@ -105,9 +105,9 @@ void DeleteJob::run()
 char *DeleteJob::getDelFileString()

 {

 	if (ftp->ftpProto == ServerList::FTP::FT_SSH)

-		mir_snprintf(buff, sizeof(buff), "rm \"%s/%s\"", ftp->szDir, entry->szFileName);

+		mir_snprintf(buff, SIZEOF(buff), "rm \"%s/%s\"", ftp->szDir, entry->szFileName);

 	else

-		mir_snprintf(buff, sizeof(buff), "DELE %s", entry->szFileName);

+		mir_snprintf(buff, SIZEOF(buff), "DELE %s", entry->szFileName);

 

 	return buff;

 }

@@ -115,9 +115,9 @@ char *DeleteJob::getDelFileString()
 char *DeleteJob::getDelUrlString()

 {	

 	if (ftp->szDir[0] && ftp->ftpProto != ServerList::FTP::FT_SSH)

-		mir_snprintf(buff, sizeof(buff), "%s%s/%s/", ftp->getProtoString(), ftp->szServer, ftp->szDir);

+		mir_snprintf(buff, SIZEOF(buff), "%s%s/%s/", ftp->getProtoString(), ftp->szServer, ftp->szDir);

 	else

-		mir_snprintf(buff, sizeof(buff), "%s%s/", ftp->getProtoString(), ftp->szServer);

+		mir_snprintf(buff, SIZEOF(buff), "%s%s/", ftp->getProtoString(), ftp->szServer);

 

 	return buff;

 }
\ No newline at end of file
diff --git a/plugins/FTPFileYM/src/job_upload.cpp b/plugins/FTPFileYM/src/job_upload.cpp
index abe8240f93..0171f8ae8d 100644
--- a/plugins/FTPFileYM/src/job_upload.cpp
+++ b/plugins/FTPFileYM/src/job_upload.cpp
@@ -182,9 +182,9 @@ void UploadJob::start()
 char *UploadJob::getChmodString()

 {

 	if (ftp->ftpProto == ServerList::FTP::FT_SSH) 

-		mir_snprintf(buff, sizeof(buff), "%s \"%s/%s\"", ftp->szChmod, ftp->szDir, this->szSafeFileName);

+		mir_snprintf(buff, SIZEOF(buff), "%s \"%s/%s\"", ftp->szChmod, ftp->szDir, this->szSafeFileName);

 	else 

-		mir_snprintf(buff, sizeof(buff), "%s %s", ftp->szChmod, this->szSafeFileName);

+		mir_snprintf(buff, SIZEOF(buff), "%s %s", ftp->szChmod, this->szSafeFileName);

 

 	return buff;

 }

@@ -192,9 +192,9 @@ char *UploadJob::getChmodString()
 char *UploadJob::getDelFileString()

 {

 	if (ftp->ftpProto == ServerList::FTP::FT_SSH)

-		mir_snprintf(buff, sizeof(buff), "rm \"%s/%s\"", ftp->szDir, this->szSafeFileName);

+		mir_snprintf(buff, SIZEOF(buff), "rm \"%s/%s\"", ftp->szDir, this->szSafeFileName);

 	else

-		mir_snprintf(buff, sizeof(buff), "DELE %s", this->szSafeFileName);

+		mir_snprintf(buff, SIZEOF(buff), "DELE %s", this->szSafeFileName);

 

 	return buff;

 }

@@ -202,9 +202,9 @@ char *UploadJob::getDelFileString()
 char *UploadJob::getUrlString()

 {

 	if (ftp->szDir[0])

-		mir_snprintf(buff, sizeof(buff), "%s%s/%s/%s", ftp->getProtoString(), ftp->szServer, ftp->szDir, this->szSafeFileName);

+		mir_snprintf(buff, SIZEOF(buff), "%s%s/%s/%s", ftp->getProtoString(), ftp->szServer, ftp->szDir, this->szSafeFileName);

 	else

-		mir_snprintf(buff, sizeof(buff), "%s%s/%s", ftp->getProtoString(), ftp->szServer, this->szSafeFileName);

+		mir_snprintf(buff, SIZEOF(buff), "%s%s/%s", ftp->getProtoString(), ftp->szServer, this->szSafeFileName);

 

 	return buff;

 }

@@ -212,9 +212,9 @@ char *UploadJob::getUrlString()
 char *UploadJob::getDelUrlString()

 {

 	if (ftp->szDir[0] && ftp->ftpProto != ServerList::FTP::FT_SSH)

-		mir_snprintf(buff, sizeof(buff), "%s%s/%s/", ftp->getProtoString(), ftp->szServer, ftp->szDir);

+		mir_snprintf(buff, SIZEOF(buff), "%s%s/%s/", ftp->getProtoString(), ftp->szServer, ftp->szDir);

 	else

-		mir_snprintf(buff, sizeof(buff), "%s%s/", ftp->getProtoString(), ftp->szServer);

+		mir_snprintf(buff, SIZEOF(buff), "%s%s/", ftp->getProtoString(), ftp->szServer);

 

 	return buff;

 }

@@ -316,7 +316,7 @@ void UploadJob::upload()
 		

 		if (result != CURLE_OK && result != CURLE_ABORTED_BY_CALLBACK) {

 			char buff[256];

-			mir_snprintf(buff, sizeof(buff), Translate("FTP error occurred.\n%s"), this->szError);

+			mir_snprintf(buff, SIZEOF(buff), Translate("FTP error occurred.\n%s"), this->szError);

 			Utils::msgBoxA(buff, MB_OK | MB_ICONERROR);

 		}

 			

diff --git a/plugins/FTPFileYM/src/manager.cpp b/plugins/FTPFileYM/src/manager.cpp
index 9db3710d17..7e5fa09bae 100644
--- a/plugins/FTPFileYM/src/manager.cpp
+++ b/plugins/FTPFileYM/src/manager.cpp
@@ -83,7 +83,7 @@ void Manager::initImageList()
 

 	for (int i = 0; i < ServerList::FTP_COUNT; i++) 

 	{

-		mir_snprintf(buff, sizeof(buff), "ftp%d", i);

+		mir_snprintf(buff, SIZEOF(buff), "ftp%d", i);

 		ImageList_AddIcon(himlStates, Utils::loadIconEx(buff));

 	}

 

diff --git a/plugins/FTPFileYM/src/mir_db.cpp b/plugins/FTPFileYM/src/mir_db.cpp
index dedd8dc256..79057d2aab 100644
--- a/plugins/FTPFileYM/src/mir_db.cpp
+++ b/plugins/FTPFileYM/src/mir_db.cpp
@@ -21,56 +21,56 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 int DB::setByteF(MCONTACT hContact, char *szModule, char *szSetting, int id, int iValue)

 {

 	char formSet[256];

-	mir_snprintf(formSet, sizeof(formSet), szSetting, id);

+	mir_snprintf(formSet, SIZEOF(formSet), szSetting, id);

 	return db_set_b(hContact, szModule, formSet, iValue);

 }

 

 int DB::setWordF(MCONTACT hContact, char *szModule, char *szSetting, int id, int iValue)

 {

 	char formSet[256];

-	mir_snprintf(formSet, sizeof(formSet), szSetting, id);

+	mir_snprintf(formSet, SIZEOF(formSet), szSetting, id);

 	return db_set_w(hContact, szModule, formSet, iValue);

 }

 

 int DB::setDwordF(MCONTACT hContact, char *szModule, char *szSetting, int id, int iValue)

 {

 	char formSet[256];

-	mir_snprintf(formSet, sizeof(formSet), szSetting, id);

+	mir_snprintf(formSet, SIZEOF(formSet), szSetting, id);

 	return db_set_dw(hContact, szModule, formSet, iValue);

 }

 

 int DB::setAStringF(MCONTACT hContact, char *szModule, char *szSetting, int id, char *szValue)

 {

 	char formSet[256];

-	mir_snprintf(formSet, sizeof(formSet), szSetting, id);

+	mir_snprintf(formSet, SIZEOF(formSet), szSetting, id);

 	return db_set_s(hContact, szModule, formSet, szValue);

 }

 

 int DB::setStringF(MCONTACT hContact, char *szModule, char *szSetting, int id, TCHAR *stzValue)

 {

 	char formSet[256];

-	mir_snprintf(formSet, sizeof(formSet), szSetting, id);

+	mir_snprintf(formSet, SIZEOF(formSet), szSetting, id);

 	return db_set_ts(hContact, szModule, formSet, stzValue);

 }

 

 int DB::getByteF(MCONTACT hContact, char *szModule, char *szSetting, int id, int iErrorValue)

 {

 	char formSet[256];

-	mir_snprintf(formSet, sizeof(formSet), szSetting, id);

+	mir_snprintf(formSet, SIZEOF(formSet), szSetting, id);

 	return db_get_b(hContact, szModule, formSet, iErrorValue);

 }

 

 int DB::getWordF(MCONTACT hContact, char *szModule, char *szSetting, int id, int iErrorValue)

 {

 	char formSet[256];

-	mir_snprintf(formSet, sizeof(formSet), szSetting, id);

+	mir_snprintf(formSet, SIZEOF(formSet), szSetting, id);

 	return db_get_w(hContact, szModule, formSet, iErrorValue);

 }

 

 int DB::getDwordF(MCONTACT hContact, char *szModule, char *szSetting, int id, int iErrorValue)

 {

 	char formSet[256];

-	mir_snprintf(formSet, sizeof(formSet), szSetting, id);

+	mir_snprintf(formSet, SIZEOF(formSet), szSetting, id);

 	return db_get_dw(hContact, szModule, formSet, iErrorValue);

 }

 

@@ -91,7 +91,7 @@ int DB::getAString(MCONTACT hContact, char *szModule, char *szSetting, char *buf
 int DB::getAStringF(MCONTACT hContact, char *szModule, char *szSetting, int id, char *buff)

 {

 	char formSet[256];

-	mir_snprintf(formSet, sizeof(formSet), szSetting, id);

+	mir_snprintf(formSet, SIZEOF(formSet), szSetting, id);

 	return getAString(hContact, szModule, formSet, buff);

 }

 

@@ -112,13 +112,13 @@ int DB::getString(MCONTACT hContact, char *szModule, char *szSetting, TCHAR *buf
 int DB::getStringF(MCONTACT hContact, char *szModule, char *szSetting, int id, TCHAR *buff)

 {

 	char formSet[256];

-	mir_snprintf(formSet, sizeof(formSet), szSetting, id);

+	mir_snprintf(formSet, SIZEOF(formSet), szSetting, id);

 	return getString(hContact, szModule, formSet, buff);

 }

 

 int DB::deleteSettingF(MCONTACT hContact, char *szModule, char *szSetting, int id)

 {

 	char formSet[256];

-	mir_snprintf(formSet, sizeof(formSet), szSetting, id);

+	mir_snprintf(formSet, SIZEOF(formSet), szSetting, id);

 	return db_unset(hContact, szModule, formSet);

 }

diff --git a/plugins/FTPFileYM/src/serverlist.cpp b/plugins/FTPFileYM/src/serverlist.cpp
index d199228675..5b7d5396ad 100644
--- a/plugins/FTPFileYM/src/serverlist.cpp
+++ b/plugins/FTPFileYM/src/serverlist.cpp
@@ -45,7 +45,7 @@ void ServerList::saveToDb() const
 	ServerList::FTP *ftp = ftpList.getSelected();

 	char buff[256];

 

-	mir_snprintf(buff, sizeof(buff), "Password%d", opt.selected);

+	mir_snprintf(buff, SIZEOF(buff), "Password%d", opt.selected);

 	DB::setAStringF(0, MODULE, buff, opt.selected, ftp->szPass);

 

 	DB::setStringF(0, MODULE, "Name%d", opt.selected, ftp->stzName);

diff --git a/plugins/FTPFileYM/src/utils.cpp b/plugins/FTPFileYM/src/utils.cpp
index e824e35e7e..ed31daf5ff 100644
--- a/plugins/FTPFileYM/src/utils.cpp
+++ b/plugins/FTPFileYM/src/utils.cpp
@@ -48,7 +48,7 @@ int Utils::msgBoxA(char *szMsg, UINT uType)
 HICON Utils::loadIconEx(char *szName)

 {

 	char buff[100];

-	mir_snprintf(buff, sizeof(buff), "%s_%s", MODULE, szName);

+	mir_snprintf(buff, SIZEOF(buff), "%s_%s", MODULE, szName);

 	return Skin_GetIcon(buff);

 }

 

@@ -139,7 +139,7 @@ void Utils::curlSetOpt(CURL *hCurl, ServerList::FTP *ftp, char *url, struct curl
 	else

 		curl_easy_setopt(hCurl, CURLOPT_FTPPORT, "-");

 

-	mir_snprintf(buff, sizeof(buff), "%s:%s", ftp->szUser, ftp->szPass);

+	mir_snprintf(buff, SIZEOF(buff), "%s:%s", ftp->szUser, ftp->szPass);

 	curl_easy_setopt(hCurl, CURLOPT_USERPWD, buff);

 

 	if (ftp->ftpProto == ServerList::FTP::FT_SSL_EXPLICIT || ftp->ftpProto == ServerList::FTP::FT_SSL_IMPLICIT)