Changeset bc73be3 in mainline for uspace/app/df/df.c

Timestamp:

2019-06-27T08:51:20Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

8add15e0

Parents:

ad40b74b (diff), aeba767 (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:

cpp: merge and resolve conflicts

File:

• uspace/app/df/df.c (modified) (2 diffs)

uspace/app/df/df.c

@@ -70 +70 @@
 
         /* Parse command-line options */
-        while ((optres = getopt(argc, argv, ":ubh")) != -1) {
+        while ((optres = getopt(argc, argv, "ubh")) != -1) {
                 switch (optres) {
                 case 'h':
@@ -78 +78 @@
                 case 'b':
                         display_blocks = true;
-                        break;
-
-                case ':':
-                        fprintf(stderr, "Option -%c requires an operand\n",
-                            optopt);
-                        errflg++;
                         break;