Changeset cb569e6 in mainline for uspace/app/netecho/netecho.c


Ignore:
Timestamp:
2010-11-18T21:58:27Z (13 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
4e5c7ba
Parents:
69e0d6d (diff), 45f04f8 (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.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/app/netecho/netecho.c

    r69e0d6d rcb569e6  
    173173                                } else if (str_lcmp(argv[index] + 2, "count=", 6) == 0) {
    174174                                        rc = arg_parse_int(argc, argv, &index, &count, 8);
     175                                        if (rc != EOK)
     176                                                return rc;
    175177                                } else if (str_lcmp(argv[index] + 2, "family=", 7) == 0) {
    176178                                        rc = arg_parse_name_int(argc, argv, &index, &family, 9, socket_parse_protocol_family);
Note: See TracChangeset for help on using the changeset viewer.