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

small fixs cleanups



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

3 files changed, 9 insertions, 9 deletions

diff --git a/protocols/SkypeClassic/src/skype.cpp b/protocols/SkypeClassic/src/skype.cpp
index 8fc3c11d8e..2427a8a29d 100644
--- a/protocols/SkypeClassic/src/skype.cpp
+++ b/protocols/SkypeClassic/src/skype.cpp
@@ -833,7 +833,7 @@ int OnModulesLoaded(WPARAM, LPARAM) {
 

 		if (!ServiceExists(MS_UTILS_REPLACEVARS) || !(tmpPath = Utils_ReplaceVars("%miranda_avatarcache%")))

 			tmpPath = PROFILE_PATH;

-		mir_snprintf(DefaultAvatarsFolder, sizeof(DefaultAvatarsFolder), "%s\\%s", tmpPath, SKYPE_PROTONAME);

+		mir_snprintf(DefaultAvatarsFolder, SIZEOF(DefaultAvatarsFolder), "%s\\%s", tmpPath, SKYPE_PROTONAME);

 		hProtocolAvatarsFolder = (HANDLE)FoldersRegisterCustomPath(SKYPE_PROTONAME, "Avatars Cache", DefaultAvatarsFolder);

 	}

 

@@ -841,7 +841,7 @@ int OnModulesLoaded(WPARAM, LPARAM) {
 	{

 		// Use defaults

 		CallService(MS_DB_GETPROFILEPATH, (WPARAM)MAX_PATH, (LPARAM)DefaultAvatarsFolder);

-		mir_snprintf(DefaultAvatarsFolder, sizeof(DefaultAvatarsFolder), "%s\\%s", DefaultAvatarsFolder, SKYPE_PROTONAME);

+		mir_snprintf(DefaultAvatarsFolder, SIZEOF(DefaultAvatarsFolder), "%s\\%s", DefaultAvatarsFolder, SKYPE_PROTONAME);

 		CreateDirectoryA(DefaultAvatarsFolder, NULL);

 	}

 

@@ -2411,9 +2411,9 @@ void RetrieveUserAvatar(void *param)
 			// Get filename

 			FoldersGetCustomPath(hProtocolAvatarsFolder, AvatarFile, sizeof(AvatarFile), DefaultAvatarsFolder);

 			if (!*AvatarFile) strcpy(AvatarFile, DefaultAvatarsFolder);

-			mir_snprintf(AvatarTmpFile, sizeof(AvatarTmpFile), "AVATAR 1 %s\\%s_tmp.jpg", AvatarFile, dbv.pszVal);

+			mir_snprintf(AvatarTmpFile, SIZEOF(AvatarTmpFile), "AVATAR 1 %s\\%s_tmp.jpg", AvatarFile, dbv.pszVal);

 			pszTempFile = AvatarTmpFile + 9;

-			mir_snprintf(AvatarFile, sizeof(AvatarFile), "%s\\%s.jpg", AvatarFile, dbv.pszVal);

+			mir_snprintf(AvatarFile, SIZEOF(AvatarFile), "%s\\%s.jpg", AvatarFile, dbv.pszVal);

 

 			// Just to be sure

 			DeleteFileA(pszTempFile);

@@ -2511,7 +2511,7 @@ INT_PTR SkypeGetAvatarInfo(WPARAM wParam, LPARAM lParam)
 

 		// Get filename

 		FoldersGetCustomPath(hProtocolAvatarsFolder, AvatarFile, sizeof(AvatarFile), DefaultAvatarsFolder);

-		mir_snprintf(AvatarFile, sizeof(AvatarFile), "%s\\%s.jpg", AvatarFile, dbv.pszVal);

+		mir_snprintf(AvatarFile, SIZEOF(AvatarFile), "%s\\%s.jpg", AvatarFile, dbv.pszVal);

 		db_free(&dbv);

 

 		// Check if the file exists

diff --git a/protocols/SkypeClassic/src/skypeapi.cpp b/protocols/SkypeClassic/src/skypeapi.cpp
index 8ed5900f57..ebc74afeda 100644
--- a/protocols/SkypeClassic/src/skypeapi.cpp
+++ b/protocols/SkypeClassic/src/skypeapi.cpp
@@ -1072,7 +1072,7 @@ INT_PTR SkypeSetAvatar(WPARAM wParam, LPARAM lParam) {
 	

 	FoldersGetCustomPath(hProtocolAvatarsFolder, AvatarFile, sizeof(AvatarFile), DefaultAvatarsFolder);

 	if (!*AvatarFile) strcpy (AvatarFile, DefaultAvatarsFolder);

-	mir_snprintf(AvatarFile, sizeof(AvatarFile), "%s\\%s avatar.%s", AvatarFile, SKYPE_PROTONAME, ext);

+	mir_snprintf(AvatarFile, SIZEOF(AvatarFile), "%s\\%s avatar.%s", AvatarFile, SKYPE_PROTONAME, ext);

 

 	// Backup old file

 	if (hasOldAvatar)

@@ -1100,7 +1100,7 @@ INT_PTR SkypeSetAvatar(WPARAM wParam, LPARAM lParam) {
 	}

 

 	// Try to set with skype

-	mir_snprintf(command, sizeof(command), "SET AVATAR 1 %s", AvatarFile);

+	mir_snprintf(command, SIZEOF(command), "SET AVATAR 1 %s", AvatarFile);

 	if (SkypeSend(command) || (ptr = SkypeRcv(command+4, INFINITE)) == NULL || !strncmp(ptr, "ERROR", 5))

 	{

 		DeleteFileA(AvatarFile);

diff --git a/protocols/SkypeClassic/src/skypeopt.cpp b/protocols/SkypeClassic/src/skypeopt.cpp
index 246e3403a2..69dc438c2a 100644
--- a/protocols/SkypeClassic/src/skypeopt.cpp
+++ b/protocols/SkypeClassic/src/skypeopt.cpp
@@ -755,7 +755,7 @@ int OnDetailsInit( WPARAM wParam, LPARAM lParam )
 		

 		if (mirandaVersion < PLUGIN_MAKE_VERSION(0, 7, 0, 27) && !bIsImoproxy)

 		{

-			mir_snprintf( szTitle, sizeof( szTitle ), "%s %s", SKYPE_PROTONAME, Translate( "Avatar" ));

+			mir_snprintf( szTitle, SIZEOF( szTitle ), "%s %s", SKYPE_PROTONAME, Translate( "Avatar" ));

 

 			odp.pfnDlgProc = AvatarDlgProc;

 			odp.position = 1900000000;

@@ -764,7 +764,7 @@ int OnDetailsInit( WPARAM wParam, LPARAM lParam )
 			UserInfo_AddPage(wParam, &odp);

 		}

 

-		mir_snprintf( szTitle, sizeof( szTitle ), "%s %s", SKYPE_PROTONAME, Translate( "Details" ));

+		mir_snprintf( szTitle, SIZEOF( szTitle ), "%s %s", SKYPE_PROTONAME, Translate( "Details" ));

 	

 		odp.pfnDlgProc = DetailsDlgProc;

 		odp.position = 1900000000;