[Scummvm-cvs-logs] CVS: scummvm/backends/epoc/src portdefs.h,1.1,1.2

Lars Persson anotherguest at users.sourceforge.net
Sat Dec 3 13:58:00 CET 2005


Update of /cvsroot/scummvm/scummvm/backends/epoc/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4187/backends/epoc/src

Modified Files:
	portdefs.h 
Log Message:
Codeformatting update

Index: portdefs.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/epoc/src/portdefs.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- portdefs.h	3 Dec 2005 21:29:13 -0000	1.1
+++ portdefs.h	3 Dec 2005 21:57:04 -0000	1.2
@@ -68,8 +68,7 @@
 
 	/* convert double float to double int (dfdi) */
 	long long inline
-	scumm_fixdfdi (double a1) // __fixdfdi (double a1)
-	{
+	scumm_fixdfdi (double a1) { // __fixdfdi (double a1)
 	    register union double_long dl1;
 	    register int exp;
 	    register long long l;
@@ -77,7 +76,7 @@
 	    dl1.d = a1;
 	
 	    if (!dl1.l.upper && !dl1.l.lower)
-		return (0);
+			return (0);
 	
 	    exp = EXPD (dl1) - EXCESSD - 64;
 	    l = MANTD_LL(dl1);
@@ -91,9 +90,9 @@
 	
 	    /* shift down until exp = 0 or l = 0 */
 	    if (exp < 0 && exp > -64 && l)
-		l >>= -exp;
+			l >>= -exp;
 	    else
-		return (0);
+			return (0);
 	
 	    return (SIGND (dl1) ? -l : l);
 	}
@@ -109,8 +108,7 @@
 #else // WINS
 
 	// let's just blatantly ignore this for now and just get it to work :P but does n't work from the debug function
-	int inline scumm_snprintf (char *str, unsigned long /*n*/, char const *fmt, ...)
-	{
+	int inline scumm_snprintf (char *str, unsigned long /*n*/, char const *fmt, ...) {
 		va_list args;
 		va_start(args, fmt);
 		vsprintf(str, fmt, args);
@@ -130,9 +128,9 @@
 void inline *scumm_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++)
-		if (compar(key, (void*)((size_t)base + size * i)) == 0)
-			return (void*)((size_t)base + size * 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;
 }
 #define bsearch						scumm_bsearch





More information about the Scummvm-git-logs mailing list