Changeset 32eceb4f in mainline for uspace/app


Ignore:
Timestamp:
2010-11-20T22:30:36Z (15 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
cb59f787
Parents:
1b22bd4 (diff), 7e1f9b7 (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

Location:
uspace/app
Files:
2 deleted
5 edited

Legend:

Unmodified
Added
Removed

  • uspace/app/bdsh/cmds/builtins/builtins.h

    r1b22bd4 r32eceb4f  
    1010#include "cd/cd_def.h"
    1111#include "exit/exit_def.h"
    12         {NULL, NULL, NULL, NULL, NULL}
     12        {NULL, NULL, NULL, NULL, 0}
    1313};
    1414

  • uspace/app/netecho/print_error.h

    r1b22bd4 r32eceb4f  
    4343 *
    4444 * @param[in] error_code The error code.
    45  * @returns A value indicating whether the error code may be an ICMP error code.
     45 * @return A value indicating whether the error code may be an ICMP error code.
    4646 */
    4747#define IS_ICMP_ERROR(error_code)       ((error_code) > 0)
    … …  
    5050 *
    5151 * @param[in] error_code The error code.
    52  * @returns A value indicating whether the error code may be a socket error code.
     52 * @return A value indicating whether the error code may be a socket error code.
    5353 */
    5454#define IS_SOCKET_ERROR(error_code)     ((error_code) < 0)

  • uspace/app/nettest1/nettest.c

    r1b22bd4 r32eceb4f  
    4949 * @param[in] family The socket address family.
    5050 * @param[in] type The socket type.
    51  * @returns EOK on success.
    52  * @returns Other error codes as defined for the socket() function.
     51 * @return EOK on success.
     52 * @return Other error codes as defined for the socket() function.
    5353 */
    5454int sockets_create(int verbose, int *socket_ids, int sockets, int family, sock_type_t type)
    … …  
    8080 * @param[in] socket_ids A field of stored socket identifiers.
    8181 * @param[in] sockets The number of sockets in the field. Should be at most the size of the field.
    82  * @returns EOK on success.
    83  * @returns Other error codes as defined for the closesocket() function.
     82 * @return EOK on success.
     83 * @return Other error codes as defined for the closesocket() function.
    8484 */
    8585int sockets_close(int verbose, int *socket_ids, int sockets)
    … …  
    114114 * @param[in] address The destination host address to connect to.
    115115 * @param[in] addrlen The length of the destination address in bytes.
    116  * @returns EOK on success.
    117  * @returns Other error codes as defined for the connect() function.
     116 * @return EOK on success.
     117 * @return Other error codes as defined for the connect() function.
    118118 */
    119119int sockets_connect(int verbose, int *socket_ids, int sockets, struct sockaddr *address, socklen_t addrlen)
    … …  
    150150 * @param[in] size The data size in bytes.
    151151 * @param[in] messages The number of datagrams per socket to be sent.
    152  * @returns EOK on success.
    153  * @returns Other error codes as defined for the sendto() function.
     152 * @return EOK on success.
     153 * @return Other error codes as defined for the sendto() function.
    154154 */
    155155int sockets_sendto(int verbose, int *socket_ids, int sockets, struct sockaddr *address, socklen_t addrlen, char *data, int size, int messages)
    … …  
    190190 * @param[in] size The maximum data size in bytes.
    191191 * @param[in] messages The number of datagrams per socket to be received.
    192  * @returns EOK on success.
    193  * @returns Other error codes as defined for the recvfrom() function.
     192 * @return EOK on success.
     193 * @return Other error codes as defined for the recvfrom() function.
    194194 */
    195195int sockets_recvfrom(int verbose, int *socket_ids, int sockets, struct sockaddr *address, socklen_t *addrlen, char *data, int size, int messages)
    … …  
    232232 * @param[in] size The data size in bytes.
    233233 * @param[in] messages The number of datagrams per socket to be received.
    234  * @returns EOK on success.
    235  * @returns Other error codes as defined for the recvfrom() function.
     234 * @return EOK on success.
     235 * @return Other error codes as defined for the recvfrom() function.
    236236 */
    237237int sockets_sendto_recvfrom(int verbose, int *socket_ids, int sockets, struct sockaddr *address, socklen_t *addrlen, char *data, int size, int messages)

  • uspace/app/nettest1/nettest1.c

    r1b22bd4 r32eceb4f  
    388388                return ENOMEM;
    389389        }
    390         socket_ids[sockets] = NULL;
     390        socket_ids[sockets] = 0;
    391391
    392392        if (verbose)

  • uspace/app/nettest2/nettest2.c

    r1b22bd4 r32eceb4f  
    336336                return ENOMEM;
    337337        }
    338         socket_ids[sockets] = NULL;
     338        socket_ids[sockets] = 0;
    339339
    340340        if (verbose)
Note: See TracChangeset for help on using the changeset viewer.