Changeset 32eceb4f in mainline for uspace/app/nettest1/nettest.c

Timestamp:

2010-11-20T22:30:36Z (13 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

File:

• uspace/app/nettest1/nettest.c (modified) (6 diffs)

uspace/app/nettest1/nettest.c

@@ -49 +49 @@
  * @param[in] family The socket address family.
  * @param[in] type The socket type.
- * @returns EOK on success.
- * @returns Other error codes as defined for the socket() function.
+ * @return EOK on success.
+ * @return Other error codes as defined for the socket() function.
  */
 int sockets_create(int verbose, int *socket_ids, int sockets, int family, sock_type_t type)
@@ -80 +80 @@
  * @param[in] socket_ids A field of stored socket identifiers.
  * @param[in] sockets The number of sockets in the field. Should be at most the size of the field.
- * @returns EOK on success.
- * @returns Other error codes as defined for the closesocket() function.
+ * @return EOK on success.
+ * @return Other error codes as defined for the closesocket() function.
  */
 int sockets_close(int verbose, int *socket_ids, int sockets)
@@ -114 +114 @@
  * @param[in] address The destination host address to connect to.
  * @param[in] addrlen The length of the destination address in bytes.
- * @returns EOK on success.
- * @returns Other error codes as defined for the connect() function.
+ * @return EOK on success.
+ * @return Other error codes as defined for the connect() function.
  */
 int sockets_connect(int verbose, int *socket_ids, int sockets, struct sockaddr *address, socklen_t addrlen)
@@ -150 +150 @@
  * @param[in] size The data size in bytes.
  * @param[in] messages The number of datagrams per socket to be sent.
- * @returns EOK on success.
- * @returns Other error codes as defined for the sendto() function.
+ * @return EOK on success.
+ * @return Other error codes as defined for the sendto() function.
  */
 int sockets_sendto(int verbose, int *socket_ids, int sockets, struct sockaddr *address, socklen_t addrlen, char *data, int size, int messages)
@@ -190 +190 @@
  * @param[in] size The maximum data size in bytes.
  * @param[in] messages The number of datagrams per socket to be received.
- * @returns EOK on success.
- * @returns Other error codes as defined for the recvfrom() function.
+ * @return EOK on success.
+ * @return Other error codes as defined for the recvfrom() function.
  */
 int sockets_recvfrom(int verbose, int *socket_ids, int sockets, struct sockaddr *address, socklen_t *addrlen, char *data, int size, int messages)
@@ -232 +232 @@
  * @param[in] size The data size in bytes.
  * @param[in] messages The number of datagrams per socket to be received.
- * @returns EOK on success.
- * @returns Other error codes as defined for the recvfrom() function.
+ * @return EOK on success.
+ * @return Other error codes as defined for the recvfrom() function.
  */
 int sockets_sendto_recvfrom(int verbose, int *socket_ids, int sockets, struct sockaddr *address, socklen_t *addrlen, char *data, int size, int messages)