Changeset 1abcf1d in mainline for uspace/app/tmon

Timestamp:

2018-04-10T19:43:21Z (8 years ago)

Author:

Jiří Zárevúcky <jiri.zarevucky@…>

Branches:

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

Children:

a69d42e

Parents:

9fa14d8d

Message:

puts() should append newline.

Location:

uspace/app/tmon

Files:

• main.c (modified) (2 diffs)
• tests.c (modified) (4 diffs)

uspace/app/tmon/main.c

@@ -127 +127 @@
 static void print_usage(char *app_name)
 {
-        puts(NAME ": benchmark USB diagnostic device\n\n");
+        puts(NAME ": benchmark USB diagnostic device\n");
         printf("Usage: %s command [device] [options]\n\n", app_name);
 
@@ -134 +134 @@
         }
 
-        puts("\n");
+        puts("");
         for (unsigned i = 0; i < ARRAY_SIZE(options); ++i) {
                 printf(INDENT "-%c --%s\n" INDENT INDENT "%s\n", options[i].short_name, options[i].long_name, options[i].description);
         }
 
-        puts("\nIf no device is specified, the first device is used provided that it is the only one connected. Otherwise, the command fails.\n\n");
+        puts("\nIf no device is specified, the first device is used provided that it is the only one connected. Otherwise, the command fails.\n");
 }
 

uspace/app/tmon/tests.c

@@ -94 +94 @@
                 case 't':
                         if (!optarg || str_uint32_t(optarg, NULL, 10, false, &duration_uint) != EOK) {
-                                puts(NAME ": Invalid duration.\n");
+                                puts(NAME ": Invalid duration.");
                                 rc = EINVAL;
                                 goto err_malloc;
@@ -102 +102 @@
                 case 's':
                         if (!optarg || str_size_t(optarg, NULL, 10, false, &p->transfer_size) != EOK) {
-                                puts(NAME ": Invalid data size.\n");
+                                puts(NAME ": Invalid data size.");
                                 rc = EINVAL;
                                 goto err_malloc;
@@ -182 +182 @@
         const usbdiag_test_params_t *params = (usbdiag_test_params_t *) generic_params;
         print_params(params);
-        puts("\nTesting... ");
+        fputs("\nTesting... ", stdout);
 
         usbdiag_test_results_t results;
         errno_t rc = usbdiag_test_in(exch, params, &results);
         if (rc != EOK) {
-                puts("failed\n");
+                puts("failed");
                 printf(NAME ": %s\n", str_error(rc));
                 return 1;
         }
 
-        puts("succeeded\n\n");
+        puts("succeeded\n");
         print_results(params, &results);
         return 0;
@@ -207 +207 @@
         const usbdiag_test_params_t *params = (usbdiag_test_params_t *) generic_params;
         print_params(params);
-        puts("\nTesting... ");
+        fputs("\nTesting... ", stdout);
 
         usbdiag_test_results_t results;
         errno_t rc = usbdiag_test_out(exch, params, &results);
         if (rc) {
-                puts("failed\n");
+                puts("failed");
                 printf(NAME ": %s\n", str_error(rc));
                 return 1;
         }
 
-        puts("succeeded\n\n");
+        puts("succeeded\n");
         print_results(params, &results);
         return 0;