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

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

Author: eFfeM
Date: 2008-05-03 11:13:16 +0200 (Sat, 03 May 2008)
New Revision: 1086

Modified:
   software_suite_v2/middleware/tuxdriver/trunk/src/tux_firmware.c
Log:
reworked tux_firmware_dump_descriptor


Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_firmware.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_firmware.c	2008-05-03 09:03:27 UTC (rev 1085)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_firmware.c	2008-05-03 09:13:16 UTC (rev 1086)
@@ -184,14 +184,14 @@
 }
 
 /**
- *
+ * dumps descriptor, returns pointer to the next free place
  */
-static void
+static char *
 dump_descriptor_of_cpu(char *descriptor, const firmware_descriptor_t *desc)
 {
     char *p = descriptor + strlen(descriptor);
 
-    sprintf(p,
+    p = p + sprintf(p,
         "    CPU id : \t\t\t%d\n"
         "    CPU name : \t\t\t%s\n"
         "    Version major : \t\t%d\n"
@@ -217,7 +217,7 @@
         desc->variation,
         desc->version_string
     );
-    return;
+    return p;
 }
 
 /**
@@ -226,32 +226,33 @@
 LIBLOCAL void
 tux_firmware_dump_descriptor(char *descriptor)
 {
-    char tmp_str[80] = "";
     int i;
+    char *p; /* p points to the end of the string */
+    char *versionstring;
 
-    strcat(descriptor, "- Firmwares\n");
-    
     if (firmware_release_desc.version_string[0] == '\0')
     {
-        sprintf(tmp_str, "  - %s : \t[%s]\n", 
-            RELEASE_STR_NAME, UNOFFICIAL_RELEASE_STR);
-        strcat(descriptor, tmp_str);
+        versionstring = UNOFFICIAL_RELEASE_STR;
     }
     else
     {
-        sprintf(tmp_str, "  - %s : \t[%s]\n", 
-            RELEASE_STR_NAME, firmware_release_desc.version_string);
-        strcat(descriptor, tmp_str);
+        versionstring = firmware_release_desc.version_string;
     }
 
+    p = descriptor + strlen(descriptor); /* point to the end */
+    p = p + sprintf(p, 
+        "- Firmwares\n"
+        "  - %s : \t[%s]\n", 
+        RELEASE_STR_NAME,
+        versionstring
+    );
+
     for (i = 0; i < NUMBER_OF_CPU; i++)
     {
-        sprintf(tmp_str, "  - CPU %d\n", i + 1);
-        strcat(descriptor, tmp_str);
+        p = p + sprintf(p, "  - CPU %d\n", i + 1);
 
-        dump_descriptor_of_cpu(descriptor, &firmwares_desc[i]);
+        p = dump_descriptor_of_cpu(p, &firmwares_desc[i]);
     }
-    
     return;
 }