Changeset fdbc3ff in mainline for uspace/lib/c/generic/net/inet.c

Timestamp:

2010-11-19T23:50:06Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

46d4d9f

Parents:

b4c9c61 (diff), a9c6b966 (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/inet.c (modified) (2 diffs)

uspace/lib/c/generic/net/inet.c

@@ -51 +51 @@
  *  @param[out] address The character buffer to be filled.
  *  @param[in] length   The buffer length.
- *  @returns            EOK on success.
- *  @returns            EINVAL if the data or address parameter is NULL.
- *  @returns            ENOMEM if the character buffer is not long enough.
- *  @returns            ENOTSUP if the address family is not supported.
+ *  @return             EOK on success.
+ *  @return             EINVAL if the data or address parameter is NULL.
+ *  @return             ENOMEM if the character buffer is not long enough.
+ *  @return             ENOTSUP if the address family is not supported.
  */
 int
@@ -101 +101 @@
  *  @param[in] address  The character buffer to be parsed.
  *  @param[out] data    The address data to be filled.
- *  @returns            EOK on success.
- *  @returns            EINVAL if the data parameter is NULL.
- *  @returns            ENOENT if the address parameter is NULL.
- *  @returns            ENOTSUP if the address family is not supported.
+ *  @return             EOK on success.
+ *  @return             EINVAL if the data parameter is NULL.
+ *  @return             ENOENT if the address parameter is NULL.
+ *  @return             ENOTSUP if the address family is not supported.
  */
 int inet_pton(uint16_t family, const char *address, uint8_t *data)