[Scummvm-cvs-logs] CVS: scummvm/backends/wince/missing assert.h,1.4,1.5 missing.cpp,1.9,1.10

Eugene Sandulenko sev at users.sourceforge.net
Sat Jul 30 14:14:57 CEST 2005


Update of /cvsroot/scummvm/scummvm/backends/wince/missing
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9428/backends/wince/missing

Modified Files:
	assert.h missing.cpp 
Log Message:
Remove trailing whitespaces.


Index: assert.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/missing/assert.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- assert.h	20 Dec 2004 23:52:51 -0000	1.4
+++ assert.h	30 Jul 2005 21:10:56 -0000	1.5
@@ -3,6 +3,6 @@
 #include "common/util.h"
 
 #define assert(e) ((e) ? 0 : (::error("Assertion failed " #e " (%s, %d)", __FILE__, __LINE__)))
-	
+
 #define abort() ::error("Abort (%s, %d)", __FILE__, __LINE__)
 

Index: missing.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/missing/missing.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- missing.cpp	9 Apr 2005 01:52:41 -0000	1.9
+++ missing.cpp	30 Jul 2005 21:10:56 -0000	1.10
@@ -35,25 +35,25 @@
 	char fnameMask[MAX_PATH+1];
 	TCHAR fnameUnc[MAX_PATH+1];
 	char nameFound[MAX_PATH+1];
-	
+
 	if(fname == NULL)
 		return NULL;
-	
+
 	strcpy(fnameMask, fname);
 	if(!strlen(fnameMask) || fnameMask[strlen(fnameMask)-1] != '\\')
 		strncat(fnameMask, "\\", MAX_PATH-strlen(fnameMask)-1);
 	strncat(fnameMask, "*.*", MAX_PATH-strlen(fnameMask)-4);
-	
+
 	pdir = (DIR*)malloc(sizeof(DIR)+strlen(fname));
 	pdir->dd_dir.d_ino = 0;
 	pdir->dd_dir.d_reclen = 0;
 	pdir->dd_dir.d_name = 0;
 	pdir->dd_dir.d_namlen = 0;
-	
+
 	pdir->dd_handle = 0;
 	pdir->dd_stat = 0;
 	strcpy(pdir->dd_name, fname); /* it has exactly enough space for fname and nul char */
-	
+
 	MultiByteToWideChar(CP_ACP, 0, fnameMask, -1, fnameUnc, MAX_PATH);
 	if((pdir->dd_handle = (long)FindFirstFile(fnameUnc, &wfd)) == (long)INVALID_HANDLE_VALUE)
 	{
@@ -63,7 +63,7 @@
 	else
 	{
 		WideCharToMultiByte(CP_ACP, 0, wfd.cFileName, -1, nameFound, MAX_PATH, NULL, NULL);
-		
+
 		pdir->dd_dir.d_name = strdup(nameFound);
 		pdir->dd_dir.d_namlen = strlen(nameFound);
 	}
@@ -74,7 +74,7 @@
 {
 	char nameFound[MAX_PATH+1];
 	static struct dirent dummy;
-	
+
 	if(dir->dd_stat == 0)
 	{
 		dummy.d_name = ".";
@@ -102,15 +102,15 @@
 			return NULL;
 		}
 		WideCharToMultiByte(CP_ACP, 0, wfd.cFileName, -1, nameFound, MAX_PATH, NULL, NULL);
-		
+
 		if(dir->dd_dir.d_name)
 			free(dir->dd_dir.d_name);
-		
+
 		dir->dd_dir.d_name = strdup(nameFound);
 		dir->dd_dir.d_namlen = strlen(nameFound);
-		
+
 		dir->dd_stat ++;
-		
+
 		return &dir->dd_dir;
 	}
 }
@@ -119,10 +119,10 @@
 {
 	if(dir == NULL)
 		return 0;
-	
+
 	if(dir->dd_handle)
 		FindClose((HANDLE)dir->dd_handle);
-	
+
 	if(dir->dd_dir.d_name)
 		free(dir->dd_dir.d_name);
 	free(dir);
@@ -135,10 +135,10 @@
 	TCHAR fnameUnc[MAX_PATH+1];
 	HANDLE handle;
 	int len;
-	
+
 	if(fname == NULL || ss == NULL)
 		return -1;
-	
+
 	/* Special case (dummy on WinCE) */
 	len = strlen(fname);
 	if(len >= 2 && fname[len-1] == '.' && fname[len-2] == '.' &&
@@ -150,7 +150,7 @@
 		ss->st_mode |= S_IFDIR;
 		return 0;
 	}
-	
+
 	MultiByteToWideChar(CP_ACP, 0, fname, -1, fnameUnc, MAX_PATH);
 	handle = FindFirstFile(fnameUnc, &wfd);
 	if(handle == INVALID_HANDLE_VALUE)
@@ -162,7 +162,7 @@
 		ss->st_size = wfd.nFileSizeLow;
 		if(wfd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
 			ss->st_mode |= S_IFDIR;
-		
+
 		FindClose(handle);
 	}
 	return 0;
@@ -217,7 +217,7 @@
 	static char buffer[MAX_PATH+1];
 	GetTempFileName(TEXT("."), TEXT("A8_"), 0, pTemp);
 	WideCharToMultiByte(CP_ACP, 0, pTemp, -1, buffer, MAX_PATH, NULL, NULL);
-	
+
 	if(string)
 	{
 		strcpy(string, buffer);
@@ -270,7 +270,7 @@
 {
 	TCHAR fileUnc[MAX_PATH+1];
 	char* plast;
-	
+
 	if(cwd[0] == 0)
 	{
 		GetModuleFileName(NULL, fileUnc, MAX_PATH);
@@ -293,9 +293,9 @@
 	time_t t;
 	SYSTEMTIME st;
 	GetLocalTime(&st);
-	
+
 	t = (time_t)(((((((st.wYear-1970)*12+st.wMonth)*31+st.wDay)*7+st.wDayOfWeek)*24+st.wHour)*60+st.wMinute)*60+st.wSecond);
-	
+
 	if(res)
 		*res = t;
 	return t;
@@ -305,7 +305,7 @@
 {
 	static struct tm tmLocalTime;
 	unsigned long rem = *timer;
-	
+
 	tmLocalTime.tm_sec  = (short)(rem % 60);
 	rem /= 60;
 	tmLocalTime.tm_min  = (short)(rem % 60);
@@ -319,7 +319,7 @@
 	tmLocalTime.tm_mon  = (short)(rem % 12);
 	rem /= 12;
 	tmLocalTime.tm_year = (short)(rem+1970);
-	
+
 	return &tmLocalTime;
 }
 
@@ -350,7 +350,7 @@
 FILE* wce_fopen(const char* fname, const char* fmode)
 {
 	char fullname[MAX_PATH+1];
-	
+
 	if(!fname || fname[0] == '\0')
 		return NULL;
 	if(fname[0] != '\\' && fname[0] != '/')
@@ -394,11 +394,11 @@
 		return "";
 }
 
-void *bsearch(const void *key, const void *base, size_t nmemb, 
+void *bsearch(const void *key, const void *base, size_t nmemb,
 			  size_t size, int (*compar)(const void *, const void *)) {
 	size_t i;
 
-	for (i=0; i<nmemb; i++) 
+	for (i=0; i<nmemb; i++)
 		if (compar(key, (void*)((size_t)base + size * i)) == 0)
 			return (void*)((size_t)base + size * i);
 	return NULL;
@@ -408,7 +408,7 @@
 
 void *calloc(size_t n, size_t s) {
 	void *result = malloc(n * s);
-	if (result) 
+	if (result)
 		memset(result, 0, n * s);
 
 	return result;
@@ -417,7 +417,7 @@
 char *strpbrk(const char *s, const char *accept) {
 	int i;
 
-	if (!s || !accept) 
+	if (!s || !accept)
 		return NULL;
 
 	for (i=0; i<strlen(s); i++) {
@@ -632,8 +632,8 @@
 	sscanf(nptr, "%ld", &result);
 	return result;
 }
-		
+
 
 #endif
-		
+
 





More information about the Scummvm-git-logs mailing list