[tuxdroid-svn] r987 - software_suite_v2/middleware/tuxdriver/trunk/src

[eFfeM <c2m...@c2...>]

Author: eFfeM
Date: 2008-04-20 14:03:48 +0200 (Sun, 20 Apr 2008)
New Revision: 987

Modified:
   software_suite_v2/middleware/tuxdriver/trunk/src/tux_misc.c
Log:
curlies, layout


Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_misc.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_misc.c	2008-04-20 12:01:05 UTC (rev 986)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_misc.c	2008-04-20 12:03:48 UTC (rev 987)
@@ -48,34 +48,37 @@
 static int
 gettimeofday(struct timeval *tv, struct timezone *tz)
 {
-  FILETIME ft;
-  unsigned __int64 tmpres = 0;
-  static int tzflag;
- 
-  if (NULL != tv) {
-    GetSystemTimeAsFileTime(&ft);
- 
-    tmpres |= ft.dwHighDateTime;
-    tmpres <<= 32;
-    tmpres |= ft.dwLowDateTime;
- 
-    /*converting file time to unix epoch*/
-    tmpres -= DELTA_EPOCH_IN_MICROSECS; 
-    tmpres /= 10;  /*convert into microseconds*/
-    tv->tv_sec = (long)(tmpres / 1000000UL);
-    tv->tv_usec = (long)(tmpres % 1000000UL);
-  }
- 
-  if (NULL != tz) {
-    if (!tzflag) {
-      _tzset();
-      tzflag++;
+    FILETIME ft;
+    unsigned __int64 tmpres = 0;
+    static int tzflag;
+
+    if (NULL != tv)
+    {
+	GetSystemTimeAsFileTime(&ft);
+
+	tmpres |= ft.dwHighDateTime;
+	tmpres <<= 32;
+	tmpres |= ft.dwLowDateTime;
+
+	/*converting file time to unix epoch*/
+	tmpres -= DELTA_EPOCH_IN_MICROSECS; 
+	tmpres /= 10;  /*convert into microseconds*/
+	tv->tv_sec = (long)(tmpres / 1000000UL);
+	tv->tv_usec = (long)(tmpres % 1000000UL);
     }
-    tz->tz_minuteswest = _timezone / 60;
-    tz->tz_dsttime = _daylight;
-  }
- 
-  return 0;
+
+    if (NULL != tz)
+    {
+	if (!tzflag)
+	{
+	    _tzset();
+	    tzflag++;
+	}
+	tz->tz_minuteswest = _timezone / 60;
+	tz->tz_dsttime = _daylight;
+    }
+
+    return 0;
 }
 #endif /* WIN32 */
 
@@ -102,8 +105,10 @@
     
     r = sscanf(str, "%d", &val);
     
-    if (r == 1) {
-        if ((val >= 0) && (val <= 255)) {
+    if (r == 1)
+    {
+        if ((val >= 0) && (val <= 255))
+	{
             *(unsigned char *)dest = val;
             return true;
         }
@@ -119,8 +124,10 @@
     
     r = sscanf(str, "%d", &val);
     
-    if (r == 1) {
-        if ((val >= -128) && (val <= 127)) {
+    if (r == 1)
+    {
+        if ((val >= -128) && (val <= 127))
+	{
             *(char *)dest = val;
             return true;
         }
@@ -136,7 +143,8 @@
     
     r = sscanf(str, "%d", &val);
     
-    if (r == 1) {
+    if (r == 1)
+    {
         *(int *)dest = val;
         return true;
     }
@@ -147,13 +155,19 @@
 LIBLOCAL bool
 str_to_bool(char *str, bool *dest)
 {
-    if (!strcmp(str, "True")) {
+    if (!strcmp(str, "True"))
+    {
         *(bool *)dest = true;
         return true;
-    } else if (!strcmp(str, "False")) {
-        *(bool *)dest = false;
-        return true;
     }
+    else
+    {
+	if (!strcmp(str, "False"))
+	{
+	    *(bool *)dest = false;
+	    return true;
+	}
+    }
     
     return false;
 }
@@ -166,7 +180,8 @@
     
     r = sscanf(str, "%f", &val);
     
-    if (r == 1) {
+    if (r == 1)
+    {
         *(float *)dest = val;
         return true;
     }
@@ -182,8 +197,10 @@
     
     r = sscanf(str, "0x%2x", &val);
     
-    if (r == 1) {
-        if ((val >= 0) && (val <= 255)) {
+    if (r == 1)
+    {
+        if ((val >= 0) && (val <= 255))
+	{
             *(unsigned char *)dest = val;
             return true;
         }