Index: uspace/app/netecho/netecho.c =================================================================== --- uspace/app/netecho/netecho.c (revision 774e9ecddc2054f1e7836fa9cc5ec56a5fa9edbd) +++ uspace/app/netecho/netecho.c (revision 5d0f1bc98f63dba53e1c3f9b28ec5a020e3bbe81) @@ -41,5 +41,4 @@ #include #include -#include #include @@ -91,6 +90,4 @@ int main(int argc, char *argv[]) { - ERROR_DECLARE; - size_t size = 1024; int verbose = 0; @@ -117,4 +114,5 @@ size_t reply_length; int value; + int rc; // parse the command line arguments @@ -123,11 +121,17 @@ switch (argv[index][1]) { case 'b': - ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &backlog, 0)); + rc = arg_parse_int(argc, argv, &index, &backlog, 0); + if (rc != EOK) + return rc; break; case 'c': - ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &count, 0)); + rc = arg_parse_int(argc, argv, &index, &count, 0); + if (rc != EOK) + return rc; break; case 'f': - ERROR_PROPAGATE(arg_parse_name_int(argc, argv, &index, &family, 0, socket_parse_protocol_family)); + rc = arg_parse_name_int(argc, argv, &index, &family, 0, socket_parse_protocol_family); + if (rc != EOK) + return rc; break; case 'h': @@ -136,16 +140,24 @@ break; case 'p': - ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &value, 0)); + rc = arg_parse_int(argc, argv, &index, &value, 0); + if (rc != EOK) + return rc; port = (uint16_t) value; break; case 'r': - ERROR_PROPAGATE(arg_parse_string(argc, argv, &index, &reply, 0)); + rc = arg_parse_string(argc, argv, &index, &reply, 0); + if (rc != EOK) + return rc; break; case 's': - ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &value, 0)); + rc = arg_parse_int(argc, argv, &index, &value, 0); + if (rc != EOK) + return rc; size = (value >= 0) ? (size_t) value : 0; break; case 't': - ERROR_PROPAGATE(arg_parse_name_int(argc, argv, &index, &value, 0, socket_parse_socket_type)); + rc = arg_parse_name_int(argc, argv, &index, &value, 0, socket_parse_socket_type); + if (rc != EOK) + return rc; type = (sock_type_t) value; break; @@ -156,22 +168,34 @@ case '-': if (str_lcmp(argv[index] + 2, "backlog=", 6) == 0) { - ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &backlog, 8)); + rc = arg_parse_int(argc, argv, &index, &backlog, 8); + if (rc != EOK) + return rc; } else if (str_lcmp(argv[index] + 2, "count=", 6) == 0) { - ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &count, 8)); + rc = arg_parse_int(argc, argv, &index, &count, 8); } else if (str_lcmp(argv[index] + 2, "family=", 7) == 0) { - ERROR_PROPAGATE(arg_parse_name_int(argc, argv, &index, &family, 9, socket_parse_protocol_family)); + rc = arg_parse_name_int(argc, argv, &index, &family, 9, socket_parse_protocol_family); + if (rc != EOK) + return rc; } else if (str_lcmp(argv[index] + 2, "help", 5) == 0) { echo_print_help(); return EOK; } else if (str_lcmp(argv[index] + 2, "port=", 5) == 0) { - ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &value, 7)); + rc = arg_parse_int(argc, argv, &index, &value, 7); + if (rc != EOK) + return rc; port = (uint16_t) value; } else if (str_lcmp(argv[index] + 2, "reply=", 6) == 0) { - ERROR_PROPAGATE(arg_parse_string(argc, argv, &index, &reply, 8)); + rc = arg_parse_string(argc, argv, &index, &reply, 8); + if (rc != EOK) + return rc; } else if (str_lcmp(argv[index] + 2, "size=", 5) == 0) { - ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &value, 7)); + rc = arg_parse_int(argc, argv, &index, &value, 7); + if (rc != EOK) + return rc; size = (value >= 0) ? (size_t) value : 0; } else if (str_lcmp(argv[index] + 2, "type=", 5) == 0) { - ERROR_PROPAGATE(arg_parse_name_int(argc, argv, &index, &value, 7, socket_parse_socket_type)); + rc = arg_parse_name_int(argc, argv, &index, &value, 7, socket_parse_socket_type); + if (rc != EOK) + return rc; type = (sock_type_t) value; } else if (str_lcmp(argv[index] + 2, "verbose", 8) == 0) { @@ -240,14 +264,16 @@ } // set the backlog - if (ERROR_OCCURRED(listen(listening_id, backlog))) { - socket_print_error(stderr, ERROR_CODE, "Socket listen: ", "\n"); - return ERROR_CODE; + rc = listen(listening_id, backlog); + if (rc != EOK) { + socket_print_error(stderr, rc, "Socket listen: ", "\n"); + return rc; } } // bind the listenning socket - if (ERROR_OCCURRED(bind(listening_id, address, addrlen))) { - socket_print_error(stderr, ERROR_CODE, "Socket bind: ", "\n"); - return ERROR_CODE; + rc = bind(listening_id, address, addrlen); + if (rc != EOK) { + socket_print_error(stderr, rc, "Socket bind: ", "\n"); + return rc; } @@ -301,6 +327,7 @@ // parse the source address if (address_start) { - if (ERROR_OCCURRED(inet_ntop(address->sa_family, address_start, address_string, sizeof(address_string)))) { - fprintf(stderr, "Received address error %d\n", ERROR_CODE); + rc = inet_ntop(address->sa_family, address_start, address_string, sizeof(address_string)); + if (rc != EOK) { + fprintf(stderr, "Received address error %d\n", rc); } else { data[length] = '\0'; @@ -311,12 +338,14 @@ // answer the request either with the static reply or the original data - if (ERROR_OCCURRED(sendto(socket_id, reply ? reply : data, reply ? reply_length : length, 0, address, addrlen))) - socket_print_error(stderr, ERROR_CODE, "Socket send: ", "\n"); + rc = sendto(socket_id, reply ? reply : data, reply ? reply_length : length, 0, address, addrlen); + if (rc != EOK) + socket_print_error(stderr, rc, "Socket send: ", "\n"); } // close the accepted stream socket if (type == SOCK_STREAM) { - if (ERROR_OCCURRED(closesocket(socket_id))) - socket_print_error(stderr, ERROR_CODE, "Close socket: ", "\n"); + rc = closesocket(socket_id); + if (rc != EOK) + socket_print_error(stderr, rc, "Close socket: ", "\n"); } @@ -335,7 +364,8 @@ // close the listenning socket - if (ERROR_OCCURRED(closesocket(listening_id))) { - socket_print_error(stderr, ERROR_CODE, "Close socket: ", "\n"); - return ERROR_CODE; + rc = closesocket(listening_id); + if (rc != EOK) { + socket_print_error(stderr, rc, "Close socket: ", "\n"); + return rc; }