Applied AStyle code formating as discussed on tid:74602.

Removed /SAFESEH option from MSVC11 projects.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16968 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 198 insertions, 205 deletions

diff --git a/src/common/utils.c b/src/common/utils.c
index 296df7e70..9d090f594 100644
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -15,269 +15,262 @@
 #include <math.h> // floor()
 
 #ifdef WIN32
-	#include "../common/winapi.h"
-	#ifndef F_OK
-		#define F_OK   0x0
-	#endif  /* F_OK */
+#include "../common/winapi.h"
+#ifndef F_OK
+#define F_OK   0x0
+#endif  /* F_OK */
 #else
-	#include <unistd.h>
-	#include <dirent.h>
-	#include <sys/stat.h>
+#include <unistd.h>
+#include <dirent.h>
+#include <sys/stat.h>
 #endif
 
 
 /// Dumps given buffer into file pointed to by a handle.
-void WriteDump(FILE* fp, const void* buffer, size_t length)
+void WriteDump(FILE *fp, const void *buffer, size_t length)
 {
-	size_t i;
-	char hex[48+1], ascii[16+1];
-
-	fprintf(fp, "--- 00-01-02-03-04-05-06-07-08-09-0A-0B-0C-0D-0E-0F   0123456789ABCDEF\n");
-	ascii[16] = 0;
-
-	for( i = 0; i < length; i++ )
-	{
-		char c = RBUFB(buffer,i);
-
-		ascii[i%16] = ISCNTRL(c) ? '.' : c;
-		sprintf(hex+(i%16)*3, "%02X ", RBUFB(buffer,i));
-
-		if( (i%16) == 15 )
-		{
-			fprintf(fp, "%03X %s  %s\n", (unsigned int)(i/16), hex, ascii);
-		}
-	}
-
-	if( (i%16) != 0 )
-	{
-		ascii[i%16] = 0;
-		fprintf(fp, "%03X %-48s  %-16s\n", (unsigned int)(i/16), hex, ascii);
-	}
+    size_t i;
+    char hex[48+1], ascii[16+1];
+
+    fprintf(fp, "--- 00-01-02-03-04-05-06-07-08-09-0A-0B-0C-0D-0E-0F   0123456789ABCDEF\n");
+    ascii[16] = 0;
+
+    for (i = 0; i < length; i++) {
+        char c = RBUFB(buffer,i);
+
+        ascii[i%16] = ISCNTRL(c) ? '.' : c;
+        sprintf(hex+(i%16)*3, "%02X ", RBUFB(buffer,i));
+
+        if ((i%16) == 15) {
+            fprintf(fp, "%03X %s  %s\n", (unsigned int)(i/16), hex, ascii);
+        }
+    }
+
+    if ((i%16) != 0) {
+        ascii[i%16] = 0;
+        fprintf(fp, "%03X %-48s  %-16s\n", (unsigned int)(i/16), hex, ascii);
+    }
 }
 
 
 /// Dumps given buffer on the console.
-void ShowDump(const void* buffer, size_t length)
+void ShowDump(const void *buffer, size_t length)
 {
-	size_t i;
-	char hex[48+1], ascii[16+1];
-
-	ShowDebug("--- 00-01-02-03-04-05-06-07-08-09-0A-0B-0C-0D-0E-0F   0123456789ABCDEF\n");
-	ascii[16] = 0;
-
-	for( i = 0; i < length; i++ )
-	{
-		char c = RBUFB(buffer,i);
-
-		ascii[i%16] = ISCNTRL(c) ? '.' : c;
-		sprintf(hex+(i%16)*3, "%02X ", RBUFB(buffer,i));
-
-		if( (i%16) == 15 )
-		{
-			ShowDebug("%03X %s  %s\n", i/16, hex, ascii);
-		}
-	}
-
-	if( (i%16) != 0 )
-	{
-		ascii[i%16] = 0;
-		ShowDebug("%03X %-48s  %-16s\n", i/16, hex, ascii);
-	}
+    size_t i;
+    char hex[48+1], ascii[16+1];
+
+    ShowDebug("--- 00-01-02-03-04-05-06-07-08-09-0A-0B-0C-0D-0E-0F   0123456789ABCDEF\n");
+    ascii[16] = 0;
+
+    for (i = 0; i < length; i++) {
+        char c = RBUFB(buffer,i);
+
+        ascii[i%16] = ISCNTRL(c) ? '.' : c;
+        sprintf(hex+(i%16)*3, "%02X ", RBUFB(buffer,i));
+
+        if ((i%16) == 15) {
+            ShowDebug("%03X %s  %s\n", i/16, hex, ascii);
+        }
+    }
+
+    if ((i%16) != 0) {
+        ascii[i%16] = 0;
+        ShowDebug("%03X %-48s  %-16s\n", i/16, hex, ascii);
+    }
 }
 
 
 #ifdef WIN32
 
-static char* checkpath(char *path, const char *srcpath)
-{	// just make sure the char*path is not const
-	char *p=path;
-	if(NULL!=path && NULL!=srcpath)
-	while(*srcpath) {
-		if (*srcpath=='/') {
-			*p++ = '\\';
-			srcpath++;
-		}
-		else
-			*p++ = *srcpath++;
-	}
-	*p = *srcpath; //EOS
-	return path;
+static char *checkpath(char *path, const char *srcpath)
+{
+    // just make sure the char*path is not const
+    char *p=path;
+    if (NULL!=path && NULL!=srcpath)
+        while (*srcpath) {
+            if (*srcpath=='/') {
+                *p++ = '\\';
+                srcpath++;
+            } else
+                *p++ = *srcpath++;
+        }
+    *p = *srcpath; //EOS
+    return path;
 }
 
-void findfile(const char *p, const char *pat, void (func)(const char*))
+void findfile(const char *p, const char *pat, void (func)(const char *))
 {
-	WIN32_FIND_DATAA FindFileData;
-	HANDLE hFind;
-	char tmppath[MAX_PATH+1];
-	
-	const char *path    = (p  ==NULL)? "." : p;
-	const char *pattern = (pat==NULL)? "" : pat;
-	
-	checkpath(tmppath,path);
-	if( PATHSEP != tmppath[strlen(tmppath)-1])
-		strcat(tmppath, "\\*");
-	else
-		strcat(tmppath, "*");
-	
-	hFind = FindFirstFileA(tmppath, &FindFileData);
-	if (hFind != INVALID_HANDLE_VALUE)
-	{
-		do
-		{
-			if (strcmp(FindFileData.cFileName, ".") == 0)
-				continue;
-			if (strcmp(FindFileData.cFileName, "..") == 0)
-				continue;
-
-			sprintf(tmppath,"%s%c%s",path,PATHSEP,FindFileData.cFileName);
-
-			if (FindFileData.cFileName && strstr(FindFileData.cFileName, pattern)) {
-				func( tmppath );
-			}
-
-
-			if( FindFileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY )
-			{
-				findfile(tmppath, pat, func);
-			}
-		}while (FindNextFileA(hFind, &FindFileData) != 0);
-		FindClose(hFind);
-	}
-	return;
+    WIN32_FIND_DATAA FindFileData;
+    HANDLE hFind;
+    char tmppath[MAX_PATH+1];
+
+    const char *path    = (p  ==NULL)? "." : p;
+    const char *pattern = (pat==NULL)? "" : pat;
+
+    checkpath(tmppath,path);
+    if (PATHSEP != tmppath[strlen(tmppath)-1])
+        strcat(tmppath, "\\*");
+    else
+        strcat(tmppath, "*");
+
+    hFind = FindFirstFileA(tmppath, &FindFileData);
+    if (hFind != INVALID_HANDLE_VALUE) {
+        do {
+            if (strcmp(FindFileData.cFileName, ".") == 0)
+                continue;
+            if (strcmp(FindFileData.cFileName, "..") == 0)
+                continue;
+
+            sprintf(tmppath,"%s%c%s",path,PATHSEP,FindFileData.cFileName);
+
+            if (FindFileData.cFileName && strstr(FindFileData.cFileName, pattern)) {
+                func(tmppath);
+            }
+
+
+            if (FindFileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
+                findfile(tmppath, pat, func);
+            }
+        } while (FindNextFileA(hFind, &FindFileData) != 0);
+        FindClose(hFind);
+    }
+    return;
 }
 #else
 
 #define MAX_DIR_PATH 2048
 
-static char* checkpath(char *path, const char*srcpath)
-{	// just make sure the char*path is not const
-	char *p=path;
-	if(NULL!=path && NULL!=srcpath)
-	while(*srcpath) {
-		if (*srcpath=='\\') {
-			*p++ = '/';
-			srcpath++;
-		}
-		else
-			*p++ = *srcpath++;
-	}
-	*p = *srcpath; //EOS
-	return path;
+static char *checkpath(char *path, const char *srcpath)
+{
+    // just make sure the char*path is not const
+    char *p=path;
+    if (NULL!=path && NULL!=srcpath)
+        while (*srcpath) {
+            if (*srcpath=='\\') {
+                *p++ = '/';
+                srcpath++;
+            } else
+                *p++ = *srcpath++;
+        }
+    *p = *srcpath; //EOS
+    return path;
 }
 
-void findfile(const char *p, const char *pat, void (func)(const char*))
+void findfile(const char *p, const char *pat, void (func)(const char *))
 {
-	DIR* dir;					// pointer to the scanned directory.
-	struct dirent* entry;		// pointer to one directory entry.
-	struct stat dir_stat;       // used by stat().
-	char tmppath[MAX_DIR_PATH+1];
-	char path[MAX_DIR_PATH+1]= ".";
-	const char *pattern = (pat==NULL)? "" : pat;
-	if(p!=NULL) strcpy(path,p);
-
-	// open the directory for reading
-	dir = opendir( checkpath(path, path) );
-	if (!dir) {
-		ShowError("Cannot read directory '%s'\n", path);
-		return;
-	}
-
-	// scan the directory, traversing each sub-directory
-	// matching the pattern for each file name.
-	while ((entry = readdir(dir))) {
-		// skip the "." and ".." entries.
-		if (strcmp(entry->d_name, ".") == 0)
-			continue;
-		if (strcmp(entry->d_name, "..") == 0)
-			continue;
-
-		sprintf(tmppath,"%s%c%s",path, PATHSEP, entry->d_name);
-
-		// check if the pattern matchs.
-		if (entry->d_name && strstr(entry->d_name, pattern)) {
-			func( tmppath );
-		}
-		// check if it is a directory.
-		if (stat(tmppath, &dir_stat) == -1) {
-			ShowError("stat error %s\n': ", tmppath);
-			continue;
-		}
-		// is this a directory?
-		if (S_ISDIR(dir_stat.st_mode)) {
-			// decent recursivly
-			findfile(tmppath, pat, func);
-		}
-	}//end while
-
-	closedir(dir);
+    DIR *dir;                   // pointer to the scanned directory.
+    struct dirent *entry;       // pointer to one directory entry.
+    struct stat dir_stat;       // used by stat().
+    char tmppath[MAX_DIR_PATH+1];
+    char path[MAX_DIR_PATH+1]= ".";
+    const char *pattern = (pat==NULL)? "" : pat;
+    if (p!=NULL) strcpy(path,p);
+
+    // open the directory for reading
+    dir = opendir(checkpath(path, path));
+    if (!dir) {
+        ShowError("Cannot read directory '%s'\n", path);
+        return;
+    }
+
+    // scan the directory, traversing each sub-directory
+    // matching the pattern for each file name.
+    while ((entry = readdir(dir))) {
+        // skip the "." and ".." entries.
+        if (strcmp(entry->d_name, ".") == 0)
+            continue;
+        if (strcmp(entry->d_name, "..") == 0)
+            continue;
+
+        sprintf(tmppath,"%s%c%s",path, PATHSEP, entry->d_name);
+
+        // check if the pattern matchs.
+        if (entry->d_name && strstr(entry->d_name, pattern)) {
+            func(tmppath);
+        }
+        // check if it is a directory.
+        if (stat(tmppath, &dir_stat) == -1) {
+            ShowError("stat error %s\n': ", tmppath);
+            continue;
+        }
+        // is this a directory?
+        if (S_ISDIR(dir_stat.st_mode)) {
+            // decent recursivly
+            findfile(tmppath, pat, func);
+        }
+    }//end while
+
+    closedir(dir);
 }
 #endif
 
-bool exists(const char* filename)
+bool exists(const char *filename)
 {
-	return !access(filename, F_OK);
+    return !access(filename, F_OK);
 }
 
 uint8 GetByte(uint32 val, int idx)
 {
-	switch( idx )
-	{
-	case 0: return (uint8)( (val & 0x000000FF)         );
-	case 1: return (uint8)( (val & 0x0000FF00) >> 0x08 );
-	case 2: return (uint8)( (val & 0x00FF0000) >> 0x10 );
-	case 3: return (uint8)( (val & 0xFF000000) >> 0x18 );
-	default:
+    switch (idx) {
+        case 0:
+            return (uint8)((val & 0x000000FF));
+        case 1:
+            return (uint8)((val & 0x0000FF00) >> 0x08);
+        case 2:
+            return (uint8)((val & 0x00FF0000) >> 0x10);
+        case 3:
+            return (uint8)((val & 0xFF000000) >> 0x18);
+        default:
 #if defined(DEBUG)
-		ShowDebug("GetByte: invalid index (idx=%d)\n", idx);
+            ShowDebug("GetByte: invalid index (idx=%d)\n", idx);
 #endif
-		return 0;
-	}
+            return 0;
+    }
 }
 
 uint16 GetWord(uint32 val, int idx)
 {
-	switch( idx )
-	{
-	case 0: return (uint16)( (val & 0x0000FFFF)         );
-	case 1: return (uint16)( (val & 0xFFFF0000) >> 0x10 );
-	default:
+    switch (idx) {
+        case 0:
+            return (uint16)((val & 0x0000FFFF));
+        case 1:
+            return (uint16)((val & 0xFFFF0000) >> 0x10);
+        default:
 #if defined(DEBUG)
-		ShowDebug("GetWord: invalid index (idx=%d)\n", idx);
+            ShowDebug("GetWord: invalid index (idx=%d)\n", idx);
 #endif
-		return 0;
-	}
+            return 0;
+    }
 }
 uint16 MakeWord(uint8 byte0, uint8 byte1)
 {
-	return byte0 | (byte1 << 0x08);
+    return byte0 | (byte1 << 0x08);
 }
 
 uint32 MakeDWord(uint16 word0, uint16 word1)
 {
-	return
-		( (uint32)(word0        ) )|
-		( (uint32)(word1 << 0x10) );
+    return
+        ((uint32)(word0))|
+        ((uint32)(word1 << 0x10));
 }
 
 
 /// calculates the value of A / B, in percent (rounded down)
 unsigned int get_percentage(const unsigned int A, const unsigned int B)
 {
-	double result;
+    double result;
 
-	if( B == 0 )
-	{
-		ShowError("get_percentage(): divison by zero! (A=%u,B=%u)\n", A, B);
-		return ~0U;
-	}
+    if (B == 0) {
+        ShowError("get_percentage(): divison by zero! (A=%u,B=%u)\n", A, B);
+        return ~0U;
+    }
 
-	result = 100 * ((double)A / (double)B);
+    result = 100 * ((double)A / (double)B);
 
-	if( result > UINT_MAX )
-	{
-		ShowError("get_percentage(): result percentage too high! (A=%u,B=%u,result=%g)\n", A, B, result);
-		return UINT_MAX;
-	}
+    if (result > UINT_MAX) {
+        ShowError("get_percentage(): result percentage too high! (A=%u,B=%u,result=%g)\n", A, B, result);
+        return UINT_MAX;
+    }
 
-	return (unsigned int)floor(result);
+    return (unsigned int)floor(result);
 }