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

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

Author: eFfeM
Date: 2008-04-20 21:06:08 +0200 (Sun, 20 Apr 2008)
New Revision: 994

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


Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_sw_status.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_sw_status.c	2008-04-20 19:01:59 UTC (rev 993)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_sw_status.c	2008-04-20 19:06:08 UTC (rev 994)
@@ -26,11 +26,11 @@
 #   include "threading_uniform.h"
 #endif
 
-#include "version.h"
 #include "tux_firmware.h"
 #include "tux_hw_status.h"
 #include "tux_misc.h"
 #include "tux_sw_status.h"
+#include "version.h"
 
 static const char *SW_NAME[] = {
     "wings_position",
@@ -125,7 +125,9 @@
 set_value_doc(int id, char *value_doc)
 {
     if ((id < 0) || (id >= SW_STATUS_NUMBER))
+    {
         return;
+    }
 #ifdef USE_MUTEX
     mutex_lock(__status_mutex);
 #endif
@@ -326,7 +328,8 @@
 LIBLOCAL TuxDrvError
 tux_sw_status_name_from_id(int id, char *name)
 {
-    if ((id < 0) || (id >= SW_STATUS_NUMBER)) {
+    if ((id < 0) || (id >= SW_STATUS_NUMBER))
+    {
         sprintf(name, "UNKNOW");
         return E_TUXDRV_INVALIDIDENTIFIER;
     }
@@ -347,13 +350,16 @@
     mutex_lock(__status_mutex);
 #endif
     for (i = 0; i < SW_STATUS_NUMBER; i++)
-        if (!(strcmp(name, sw_status_table[i].name))) {
-            *(int *)id = i;
+    {
+        if (!(strcmp(name, sw_status_table[i].name)))
+	{
+            *id = i;
 #ifdef USE_MUTEX
             mutex_unlock(__status_mutex);
 #endif
             return E_TUXDRV_NOERROR;
         }
+    }
 #ifdef USE_MUTEX
     mutex_unlock(__status_mutex);
 #endif
@@ -400,9 +406,13 @@
     switch (sw_status_table[id].value_fmt) {
     case ID_FMT_BOOL:
         if (*(unsigned char *)sw_status_table[id].value)
+	{
             sprintf(str, "%s", bool_true);
+	}
         else
+	{
             sprintf(str, "%s", bool_false);
+	}
         break;
     case ID_FMT_UINT8:
         sprintf(str, "%d", 
@@ -450,7 +460,9 @@
 #endif
     err = tux_sw_status_name_from_id(id, name_str);
     if (err != E_TUXDRV_NOERROR)
+    {
         return err;
+    }
         
     get_status_value_str(id, value_str);
     sprintf(state, "%s:%s:%s:%.3f", 
@@ -468,7 +480,8 @@
 LIBLOCAL TuxDrvError
 tux_sw_status_get_value_str(int id, char *value)
 {
-    if ((id < 0) || (id >= SW_STATUS_NUMBER)) {
+    if ((id < 0) || (id >= SW_STATUS_NUMBER))
+    {
         sprintf(value, "NULL");
         return E_TUXDRV_INVALIDIDENTIFIER;
     }
@@ -488,11 +501,15 @@
     char tmp_str[256] = "";
     int i;
     
-    for (i = 0; i < SW_STATUS_NUMBER; i++) {
+    for (i = 0; i < SW_STATUS_NUMBER; i++)
+    {
         tux_sw_status_get_state_str(i, tmp_state);
         if (i == 0)
+	{
             sprintf(state, "%s\n", tmp_state);
-        else {
+	}
+        else
+	{
             sprintf(tmp_str, "%s\n", tmp_state);
             strcat(state, tmp_str);
         }
@@ -537,9 +554,13 @@
     
     tux_sw_status_get_state_str(id, state_str);
     
-	if (make_event)
+    if (make_event)
+    {
         if (event_funct)
+	{
             event_funct(state_str);
+	}
+    }
     
 #ifdef USE_MUTEX
     mutex_lock(__status_mutex);
@@ -616,7 +637,8 @@
     sprintf(tmp_str, "--------------------------\n\n");
     strcat(status_doc, tmp_str);
 
-    for (i = 0; i < SW_STATUS_NUMBER; i++) {
+    for (i = 0; i < SW_STATUS_NUMBER; i++)
+    {
         sprintf(tmp_str, "Status %.2d:\n", i);
         strcat(status_doc, tmp_str);
         sprintf(tmp_str, "    ID : %d\n", i);
@@ -635,11 +657,14 @@
     }
 
     doc_file = fopen(STATUS_DOC_FILE_PATH, "w");
-    if (doc_file) {
+    if (doc_file)
+    {
         fprintf(doc_file, "%s\n", status_doc);
         fclose(doc_file);
-    } else {
-		printf("file error %s\n", strerror(errno));
-	}
+    }
+    else
+    {
+	printf("file error %s\n", strerror(errno));
+    }
 }