Changeset 32eceb4f in mainline for uspace/lib/c/generic/net/modules.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/lib/c/generic/net/modules.c (modified) (4 diffs)

uspace/lib/c/generic/net/modules.c

@@ -159 +159 @@
  *
  * @param[in] need      The needed module service.
- * @returns             The phone of the needed service.
+ * @return              The phone of the needed service.
  */
 int connect_to_service(services_t need)
@@ -171 +171 @@
  *  @param[in] timeout  The connection timeout in microseconds. No timeout if
  *                      set to zero (0).
- *  @returns            The phone of the needed service.
- *  @returns            ETIMEOUT if the connection timeouted.
+ *  @return             The phone of the needed service.
+ *  @return             ETIMEOUT if the connection timeouted.
  */
 int connect_to_service_timeout(services_t need, suseconds_t timeout)
@@ -204 +204 @@
  * @param[out] data     The data buffer to be filled.
  * @param[out] length   The buffer length.
- * @returns             EOK on success.
- * @returns             EBADMEM if the data or the length parameter is NULL.
- * @returns             EINVAL if the client does not send data.
- * @returns             ENOMEM if there is not enough memory left.
- * @returns             Other error codes as defined for the
+ * @return              EOK on success.
+ * @return              EBADMEM if the data or the length parameter is NULL.
+ * @return              EINVAL if the client does not send data.
+ * @return              ENOMEM if there is not enough memory left.
+ * @return              Other error codes as defined for the
  *                      async_data_write_finalize() function.
  */
@@ -242 +242 @@
  * @param[in] data      The data buffer to be sent.
  * @param[in] data_length The buffer length.
- * @returns             EOK on success.
- * @returns             EINVAL if the client does not expect the data.
- * @returns             EOVERFLOW if the client does not expect all the data.
+ * @return              EOK on success.
+ * @return              EINVAL if the client does not expect the data.
+ * @return              EOVERFLOW if the client does not expect all the data.
  *                      Only partial data are transfered.
- * @returns             Other error codes as defined for the
+ * @return              Other error codes as defined for the
  *                      async_data_read_finalize() function.
  */