Changeset 3bacee1 in mainline for uspace/app/bdsh

Timestamp:

2018-04-12T16:27:17Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

3cf22f9

Parents:

76d0981d

git-author:

Jiri Svoboda <jiri@…> (2018-04-11 19:25:33)

git-committer:

Jiri Svoboda <jiri@…> (2018-04-12 16:27:17)

Message:

Make ccheck-fix again and commit more good files.

Location:

uspace/app/bdsh

Files:

• cmds/modules/cmp/cmp.c (modified) (3 diffs)
• test/toktest.c (modified) (4 diffs)

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

@@ -59 +59 @@
                 help_cmd_cmp(HELP_SHORT);
                 printf(
-                "Usage:  %s [options] <file1> <file2>\n"
-                "Options:\n"
-                "  -h, --help       A short option summary\n"
-                "  -v, --version    Print version information and exit\n"
-                "No output is printed; the return code is 1 if the files differ.\n",
-                cmdname);
+                    "Usage:  %s [options] <file1> <file2>\n"
+                    "Options:\n"
+                    "  -h, --help       A short option summary\n"
+                    "  -v, --version    Print version information and exit\n"
+                    "No output is printed; the return code is 1 if the files differ.\n",
+                    cmdname);
         }
 
@@ -73 +73 @@
 {
         errno_t rc = EOK;
-        const char *fn[2] = {fn0, fn1};
-        int fd[2] = {-1, -1};
+        const char *fn[2] = { fn0, fn1 };
+        int fd[2] = { -1, -1 };
         char buffer[2][CMP_BUFLEN];
         size_t offset[2];
-        aoff64_t pos[2] = {};
+        aoff64_t pos[2] = { };
 
         for (int i = 0; i < 2; i++) {
@@ -142 +142 @@
         if (argc - optind != 2) {
                 printf("%s - incorrect number of arguments. Try `%s --help'\n",
-                        cmdname, cmdname);
+                    cmdname, cmdname);
                 return CMD_FAILURE;
         }

uspace/app/bdsh/test/toktest.c

@@ -43 +43 @@
 
 /* Tokenize the input, asserts that number of tokens is okay. */
-static void prepare(const char *input, size_t expected_token_count) {
+static void prepare(const char *input, size_t expected_token_count)
+{
         str_cpy(input_buffer, MAX_INPUT, input);
 
@@ -68 +69 @@
 PCUT_TEST_SUITE(tokenizer);
 
-PCUT_TEST_AFTER {
+PCUT_TEST_AFTER
+{
         /* Destroy the tokenizer. */
         tok_fini(&tokenizer);
@@ -74 +76 @@
 
 
-PCUT_TEST(empty_input) {
+PCUT_TEST(empty_input)
+{
         prepare("", 0);
 }
 
-PCUT_TEST(only_spaces) {
+PCUT_TEST(only_spaces)
+{
         prepare("   ", 1);
 
@@ -84 +88 @@
 }
 
-PCUT_TEST(two_text_tokens) {
+PCUT_TEST(two_text_tokens)
+{
         prepare("alpha  bravo", 3);