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

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

Author: eFfeM
Date: 2008-05-03 11:28:35 +0200 (Sat, 03 May 2008)
New Revision: 1089

Modified:
   software_suite_v2/middleware/tuxdriver/trunk/src/tux_sw_status.c
Log:
improved 2 functions (same way as previous commits)


Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_sw_status.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_sw_status.c	2008-05-03 09:20:10 UTC (rev 1088)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_sw_status.c	2008-05-03 09:28:35 UTC (rev 1089)
@@ -447,22 +447,16 @@
 LIBLOCAL void
 tux_sw_status_get_all_state_str(char *state)
 {
+    char *p;
+
+    p = state; /* p always points to the end of the string */
     char tmp_state[256] = "";
-    char tmp_str[256] = "";
     int 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
-        {
-            sprintf(tmp_str, "%s\n", tmp_state);
-            strcat(state, tmp_str);
-        }
+        p = p + sprintf(p, "%s\n", tmp_state);
     }
 }
 
@@ -579,30 +573,33 @@
 {
     int i;
     char status_doc[8192] = "";
-    char tmp_str[256] = "";
     char value_str[256] = "";
     FILE *doc_file;
-    
-    strcpy(status_doc, "Tux status documentation :\n");
-    strcat(status_doc, "--------------------------\n\n");
+    char *p;
 
+    p = status_doc; /* point to the end of the string */
+    strcpy(p, "Tux status documentation :\n"
+              "--------------------------\n\n");
+
+    p = p + strlen(p);
+
     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);
-        strcat(status_doc, tmp_str);
-        sprintf(tmp_str, "    Name : %s\n", sw_status_table[i].name);
-        strcat(status_doc, tmp_str);
-        sprintf(tmp_str, "    Value type : %s\n", 
-            tux_sw_status_value_fmt_from_id(sw_status_table[i].value_fmt));
-        strcat(status_doc, tmp_str);
-        sprintf(tmp_str, "    Possible values : %s\n", 
-            sw_status_table[i].value_doc);
-        strcat(status_doc, tmp_str);
         tux_sw_status_get_state_str(i, value_str);
-        sprintf(tmp_str, "    Default state : [%s]\n\n", value_str);
-        strcat(status_doc, tmp_str);
+        p = p + sprintf(p,
+            "Status %.2d:\n"
+            "    ID : %d\n"
+            "    Name : %s\n"
+            "    Value type : %s\n" 
+            "    Possible values : %s\n" 
+            "    Default state : [%s]\n\n",
+            i,
+            i,
+            sw_status_table[i].name,
+            tux_sw_status_value_fmt_from_id(sw_status_table[i].value_fmt),
+            sw_status_table[i].value_doc,
+            value_str
+        );
     }
 
     doc_file = fopen(STATUS_DOC_FILE_PATH, "w");