Changeset 36e9cd1 in mainline for uspace/app/bdsh

Timestamp:

2010-02-10T23:15:27Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

0701066

Parents:

3149fc0

Message:

silence compiler warnings (no change in actual functionality)

Location:

uspace/app/bdsh

Files:

• cmds/builtins/builtins.h (modified) (1 diff)
• cmds/builtins/cd/cd_def.h (modified) (1 diff)
• cmds/builtins/exit/exit_def.h (modified) (1 diff)
• input.c (modified) (2 diffs)

uspace/app/bdsh/cmds/builtins/builtins.h

@@ -10 +10 @@
 #include "cd/cd_def.h"
 #include "exit/exit_def.h"
-        {NULL, NULL, NULL, NULL}
+        {NULL, NULL, NULL, NULL, NULL}
 };
 

uspace/app/bdsh/cmds/builtins/cd/cd_def.h

@@ -4 +4 @@
         &cmd_cd,
         &help_cmd_cd,
+        0
 },

uspace/app/bdsh/cmds/builtins/exit/exit_def.h

@@ -4 +4 @@
         &cmd_exit,
         &help_cmd_exit,
+        0
 },

uspace/app/bdsh/input.c

@@ -508 +508 @@
 {
         int sa, sb;
-        wchar_t tmp_c;
         char *str;
 
@@ -514 +513 @@
 
         if (sb < ti->nc) {
-                tmp_c = ti->buffer[sb];
+                wchar_t tmp_c = ti->buffer[sb];
                 ti->buffer[sb] = '\0';
-        }
-
-        str = wstr_to_astr(ti->buffer + sa);
-
-        if (sb < ti->nc)
+                str = wstr_to_astr(ti->buffer + sa);
                 ti->buffer[sb] = tmp_c;
-
+        } else
+                str = wstr_to_astr(ti->buffer + sa);
+        
         if (str == NULL)
                 goto error;