Changeset 27bdfa5 in mainline for uspace/app

Timestamp:

2011-03-30T17:34:59Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

48d4231, 87b52c9, 98169ab, e353e85

Parents:

51e5608 (diff), 917a8c8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

Location:

uspace/app

Files:

• bdsh/cmds/modules/cat/cat.c (modified) (2 diffs)
• sbi/src/run_expr.c (modified) (1 diff)
• tester/fault/fault2.c (modified) (2 diffs)
• trace/trace.c (modified) (1 diff)

uspace/app/bdsh/cmds/modules/cat/cat.c

@@ -164 +164 @@
 {
         int fd, bytes = 0, count = 0, reads = 0;
-        off64_t total = 0;
         char *buff = NULL;
         int i;
@@ -174 +173 @@
                 return 1;
         }
-
-        total = lseek(fd, 0, SEEK_END);
-        lseek(fd, 0, SEEK_SET);
 
         if (NULL == (buff = (char *) malloc(blen + 1))) {

uspace/app/sbi/src/run_expr.c

@@ -2529 +2529 @@
         if (rc1 == EOK)
                 rc2 = os_str_get_char(string->value, elem_index, &cval);
+        else
+                rc2 = EOK;
 
         if (rc1 != EOK || rc2 != EOK) {

uspace/app/tester/fault/fault2.c

@@ -29 +29 @@
 
 #include "../tester.h"
+#include <stdio.h>
 
 typedef int __attribute__((may_alias)) aliasing_int;
@@ -38 +39 @@
         
         var1 = *((aliasing_int *) (((char *) (&var)) + 1));
+        printf("Read %d\n", var1);
         
         return "Survived unaligned read";

uspace/app/trace/trace.c

@@ -872 +872 @@
 static display_mask_t parse_display_mask(const char *text)
 {
-        display_mask_t dm;
+        display_mask_t dm = 0;
         const char *c = text;