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

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

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

Modified:
   software_suite_v2/middleware/tuxdriver/trunk/src/tux_descriptor.c
   software_suite_v2/middleware/tuxdriver/trunk/src/tux_firmware.c
   software_suite_v2/middleware/tuxdriver/trunk/src/tux_firmware.h
   software_suite_v2/middleware/tuxdriver/trunk/src/tux_id.c
   software_suite_v2/middleware/tuxdriver/trunk/src/tux_id.h
   software_suite_v2/middleware/tuxdriver/trunk/src/tux_sound_flash.c
   software_suite_v2/middleware/tuxdriver/trunk/src/tux_sound_flash.h
Log:
changed descriptor outputting
all dump_descriptor functions now assume that they can write to the beginning
of the string given as argument and return a pointer to the end of the string
This avoids having to seek to the end of the string every time
(with strlen or strcat)


Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_descriptor.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_descriptor.c	2008-05-03 09:28:35 UTC (rev 1089)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_descriptor.c	2008-05-03 09:40:13 UTC (rev 1090)
@@ -57,19 +57,22 @@
 LIBLOCAL void
 tux_descriptor_dump(void)
 {
-    char descriptor[4096] = "";
+    char descriptor[4096];
+    char *p;    /* points to the end of the string */
     FILE *desc_file;
     
-    strcpy(descriptor, "Tux droid descriptor\n--------------------\n\n");
+    p = descriptor;
+    strcpy(p, "Tux droid descriptor\n--------------------\n\n");
+    p = p + strlen(p);
     
     /* Firmware descriptors */
-    tux_firmware_dump_descriptor(descriptor);
+    p = tux_firmware_dump_descriptor(p);
     
     /* Sound flash descriptor */
-    tux_sound_flash_dump_descriptor(descriptor);
+    p = tux_sound_flash_dump_descriptor(p);
     
     /* ID connection descriptor */
-    tux_id_dump_descriptor(descriptor);
+    p = tux_id_dump_descriptor(p);
     
     desc_file = fopen(DESCRIPTOR_FILE_PATH, "w");
 

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:28:35 UTC (rev 1089)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_firmware.c	2008-05-03 09:40:13 UTC (rev 1090)
@@ -223,11 +223,10 @@
 /**
  *
  */
-LIBLOCAL void
-tux_firmware_dump_descriptor(char *descriptor)
+LIBLOCAL char *
+tux_firmware_dump_descriptor(char *p)
 {
     int i;
-    char *p; /* p points to the end of the string */
     char *versionstring;
 
     if (firmware_release_desc.version_string[0] == '\0')
@@ -239,7 +238,6 @@
         versionstring = firmware_release_desc.version_string;
     }
 
-    p = descriptor + strlen(descriptor); /* point to the end */
     p = p + sprintf(p, 
         "- Firmwares\n"
         "  - %s : \t[%s]\n", 
@@ -253,7 +251,7 @@
 
         p = dump_descriptor_of_cpu(p, &firmwares_desc[i]);
     }
-    return;
+    return p;
 }
 
 /**

Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_firmware.h
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_firmware.h	2008-05-03 09:28:35 UTC (rev 1089)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_firmware.h	2008-05-03 09:40:13 UTC (rev 1090)
@@ -89,7 +89,7 @@
 extern char knowed_tuxrf_symbolic_version[VERSION_STRING_LENGTH];
 
 extern void tux_firmware_init_descriptor(void);
-extern void tux_firmware_dump_descriptor(char* descriptor);
+extern char *tux_firmware_dump_descriptor(char* descriptor);
 extern void tux_firmware_update_version(void);
 extern void tux_firmware_update_revision(void);
 extern void tux_firmware_update_author(void);

Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_id.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_id.c	2008-05-03 09:28:35 UTC (rev 1089)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_id.c	2008-05-03 09:40:13 UTC (rev 1090)
@@ -41,16 +41,12 @@
 /**
  *
  */
-LIBLOCAL void
-tux_id_dump_descriptor(char *descriptor)
+LIBLOCAL char *
+tux_id_dump_descriptor(char *p)
 {
-    char *p;
-
-    p = descriptor + strlen(descriptor); /* point to the end of the string */
-
-    sprintf(p, "- ID connection\n  - number : \t[%d]\n", id_desc.number);
+    p = p + sprintf(p, "- ID connection\n  - number : \t[%d]\n", id_desc.number);
                 
-    return;
+    return p;
 }
 
 /**

Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_id.h
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_id.h	2008-05-03 09:28:35 UTC (rev 1089)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_id.h	2008-05-03 09:40:13 UTC (rev 1090)
@@ -29,7 +29,7 @@
 extern id_descriptor_t id_desc;
 
 extern void tux_id_init_descriptor(void);
-extern void tux_id_dump_descriptor(char *descriptor);
+extern char *tux_id_dump_descriptor(char *descriptor);
 extern void tux_id_update_number(void);
 extern void tux_id_get_descriptor(void);
 extern bool tux_id_cmd_disconnect_from_tux(void);

Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_sound_flash.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_sound_flash.c	2008-05-03 09:28:35 UTC (rev 1089)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_sound_flash.c	2008-05-03 09:40:13 UTC (rev 1090)
@@ -89,15 +89,10 @@
 /**
  * Dump the sound flash descriptor part.
  */
-LIBLOCAL void
-tux_sound_flash_dump_descriptor(char *descriptor)
+LIBLOCAL char *
+tux_sound_flash_dump_descriptor(char *p)
 {
-    char *p;
-
-    p = descriptor + strlen(descriptor); /* point to the end of the string */
-
-
-    sprintf(p,
+    p = p + sprintf(p,
         "- Sound flash\n"
         "    Number of sounds : %d\n"
         "    Last used block : %d\n"
@@ -107,7 +102,7 @@
         sound_flash_desc.available_record_time
    );
 
-    return;
+    return p;
 }
 
 /**

Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_sound_flash.h
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_sound_flash.h	2008-05-03 09:28:35 UTC (rev 1089)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_sound_flash.h	2008-05-03 09:40:13 UTC (rev 1090)
@@ -37,7 +37,7 @@
 extern char knowed_track_num[128];
 
 extern void tux_sound_flash_init_descriptor(void);
-extern void tux_sound_flash_dump_descriptor(char *descriptor);
+extern char *tux_sound_flash_dump_descriptor(char *descriptor);
 extern void tux_sound_flash_update_flash_play(void);
 extern void tux_sound_flash_update_general_play(void);
 extern void tux_sound_flash_update_prog_current_track(void);