Changeset 6a7e497 in mainline for uspace/app

Timestamp:

2011-06-02T19:05:17Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

16b2ea8

Parents:

18626b3 (diff), d030e0c (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 with the original ext2 branch

Location:

uspace/app

Files:

• blkdump/blkdump.c (modified) (3 diffs)
• bnchmark/bnchmark.c (modified) (1 diff)
• ext2info/ext2info.c (modified) (2 diffs)
• testread/testread.c (modified) (1 diff)

uspace/app/blkdump/blkdump.c

@@ -202 +202 @@
         }
         
-        // Print hexadecimal values
+        /* Print hexadecimal values */
         for (pos = 0; pos < length; pos++) {
                 if (pos == length/2) {
@@ -210 +210 @@
         }
         
-        // pad with spaces if we have less than 16 bytes
+        /* Pad with spaces if we have less than 16 bytes */
         for (pos = length; pos < bytes_per_row; pos++) {
                 if (pos == length/2) {
@@ -218 +218 @@
         }
         
-        // Print printable characters
+        /* Print printable characters */
         for (pos = 0; pos < length; pos++) {
                 if (pos == length/2) {

uspace/app/bnchmark/bnchmark.c

@@ -210 +210 @@
 static void syntax_print(void)
 {
-        fprintf(stderr, "syntax: bnchmark <iterations> <test type> <log-str> <path>\n");
-        fprintf(stderr, "  <iterations>    number of times to run a given test");
-        fprintf(stderr, "  <test-type>     one of:");
-        fprintf(stderr, "                    sequential-file-read");
-        fprintf(stderr, "                    sequential-dir-read");
-        fprintf(stderr, "  <log-str>       a string to attach to results");
-        fprintf(stderr, "  <path>          file/directory to use for testing");
+        fprintf(stderr, "syntax: " NAME " <iterations> <test type> <log-str> <path>\n");
+        fprintf(stderr, "  <iterations>    number of times to run a given test\n");
+        fprintf(stderr, "  <test-type>     one of:\n");
+        fprintf(stderr, "                    sequential-file-read\n");
+        fprintf(stderr, "                    sequential-dir-read\n");
+        fprintf(stderr, "  <log-str>       a string to attach to results\n");
+        fprintf(stderr, "  <path>          file/directory to use for testing\n");
 }
 

uspace/app/ext2info/ext2info.c

@@ -95 +95 @@
         }
         
-        // Skip program name
+        /* Skip program name */
         --argc; ++argv;
         
@@ -171 +171 @@
         assert(argc == 1);
         
-        // Display common things by default
+        /* Display common things by default */
         if ((arg_flags & ARG_ALL) == 0) {
                 arg_flags = ARG_COMMON;

uspace/app/testread/testread.c

@@ -84 +84 @@
         }
         
-        // Skip program name
+        /* Skip program name */
         --argc; ++argv;