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

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

Author: eFfeM
Date: 2008-05-01 14:16:13 +0200 (Thu, 01 May 2008)
New Revision: 1064

Modified:
   software_suite_v2/middleware/tuxdriver/trunk/src/tux_cmd_parser.c
Log:
factored out some duplicated code to a helper function
there are probably more opportunities (but ran out of time)


Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_cmd_parser.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_cmd_parser.c	2008-05-01 12:03:23 UTC (rev 1063)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_cmd_parser.c	2008-05-01 12:16:13 UTC (rev 1064)
@@ -789,48 +789,50 @@
 /**
  *
  */
-LIBLOCAL TuxDrvError
-tux_cmd_parser_insert_delay_command(float delay, char *cmd_str, bool sys_cmd)
+static TuxDrvError
+insert_cmd(float delay, char *cmd_str, cmd_stack_t *stack)
 {
     TuxDrvError ret = E_TUXDRV_STACKOVERFLOW;
     int i;
     double curtime = get_time();
 
+    for (i = 0; i < NRCMDS; i++)
+    {
+        if (!strcmp(stack->cmd_list[i].cmd, ""))
+        {
+            strcpy(stack->cmd_list[i].cmd, cmd_str);
+            stack->cmd_list[i].timeout = delay + curtime;
+            ret = E_TUXDRV_NOERROR;
+            break;
+        }
+    }
+    return(ret);
+}
+
+/**
+ *
+ */
+LIBLOCAL TuxDrvError
+tux_cmd_parser_insert_delay_command(float delay, char *cmd_str, bool sys_cmd)
+{
+    TuxDrvError ret = E_TUXDRV_STACKOVERFLOW;
+
 #ifdef USE_MUTEX
     mutex_lock(__stack_mutex);
 #endif
 
     if (sys_cmd)
     {
-        for (i = 0; i < NRCMDS; i++)
-        {
-            if (!strcmp(sys_cmd_stack.cmd_list[i].cmd, ""))
-            {
-                strcpy(sys_cmd_stack.cmd_list[i].cmd, cmd_str);
-                sys_cmd_stack.cmd_list[i].timeout = delay + curtime;
-                ret = E_TUXDRV_NOERROR;
-                break;
-            }
-        }
+        ret = insert_cmd(delay, cmd_str, &sys_cmd_stack);
     }
     else
     {
-        for (i = 0; i < NRCMDS; i++)
-        {
-            if (!strcmp(user_cmd_stack.cmd_list[i].cmd, ""))
-            {
-                strcpy(user_cmd_stack.cmd_list[i].cmd, cmd_str);
-                user_cmd_stack.cmd_list[i].timeout = delay + curtime;
-                ret = E_TUXDRV_NOERROR;
-                break;
-            }
-        }
+        ret = insert_cmd(delay, cmd_str, &user_cmd_stack);
     }
 
 #ifdef USE_MUTEX
     mutex_unlock(__stack_mutex);
 #endif
-
     return ret;
 }