Changeset fdbc3ff in mainline for uspace/lib/packet/generic/packet_server.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/packet/generic/packet_server.c (modified) (5 diffs)

uspace/lib/packet/generic/packet_server.c

@@ -103 +103 @@
 };
 
-int packet_translate_local(int phone, packet_ref packet, packet_id_t packet_id)
+int packet_translate_local(int phone, packet_t *packet, packet_id_t packet_id)
 {
         if (!packet)
@@ -154 +154 @@
  * @param[in] max_content The maximal content length in bytes.
  * @param[in] max_suffix The maximal suffix length in bytes.
- * @returns             The packet of dimensions at least as given.
- * @returns             NULL if there is not enough memory left.
+ * @return              The packet of dimensions at least as given.
+ * @return              NULL if there is not enough memory left.
  */
 static packet_t
@@ -278 +278 @@
  *
  * @param[in] packet_id The first packet identifier.
- * @returns             EOK on success.
- * @returns             ENOENT if there is no such packet.
+ * @return              EOK on success.
+ * @return              ENOENT if there is no such packet.
  */
 static int packet_release_wrapper(packet_id_t packet_id)
@@ -303 +303 @@
 /** Shares the packet memory block.
  * @param[in] packet    The packet to be shared.
- * @returns             EOK on success.
- * @returns             EINVAL if the packet is not valid.
- * @returns             EINVAL if the calling module does not accept the memory.
- * @returns             ENOMEM if the desired and actual sizes differ.
- * @returns             Other error codes as defined for the
+ * @return              EOK on success.
+ * @return              EINVAL if the packet is not valid.
+ * @return              EINVAL if the calling module does not accept the memory.
+ * @return              ENOMEM if the desired and actual sizes differ.
+ * @return              Other error codes as defined for the
  *                      async_share_in_finalize() function.
  */
@@ -339 +339 @@
  * @param[out] answer_count The last parameter for the actual answer in the
  *                      answer parameter.
- * @returns             EOK on success.
- * @returns             ENOMEM if there is not enough memory left.
- * @returns             ENOENT if there is no such packet as in the packet
+ * @return              EOK on success.
+ * @return              ENOMEM if there is not enough memory left.
+ * @return              ENOENT if there is no such packet as in the packet
  *                      message parameter.
- * @returns             ENOTSUP if the message is not known.
- * @returns             Other error codes as defined for the
+ * @return              ENOTSUP if the message is not known.
+ * @return              Other error codes as defined for the
  *                      packet_release_wrapper() function.
  */