Changeset 973ef9fc in mainline for uspace/lib/net/generic/packet_client.c

Timestamp:

2010-12-25T21:20:28Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

631ee0c

Parents:

1bfd3d3 (diff), 09178b7f (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/net/generic/packet_client.c (modified) (10 diffs)

uspace/lib/net/generic/packet_client.c

@@ -57 +57 @@
  * @return              ENOMEM if there is not enough memory left.
  */
-int packet_copy_data(packet_t packet, const void *data, size_t length)
+int packet_copy_data(packet_t *packet, const void *data, size_t length)
 {
         if (!packet_is_valid(packet))
@@ -81 +81 @@
  * @return              NULL if there is not enough memory left.
  */
-void *packet_prefix(packet_t packet, size_t length)
+void *packet_prefix(packet_t *packet, size_t length)
 {
         if ((!packet_is_valid(packet)) ||
-            (packet->data_start - sizeof(struct packet) -
+            (packet->data_start - sizeof(packet_t) -
             2 * (packet->dest_addr - packet->src_addr) < length)) {
                 return NULL;
@@ -102 +102 @@
  * @return              NULL if there is not enough memory left.
  */
-void *packet_suffix(packet_t packet, size_t length)
+void *packet_suffix(packet_t *packet, size_t length)
 {
         if ((!packet_is_valid(packet)) ||
@@ -124 +124 @@
  * @return              ENOMEM if there is not enough memory left.
  */
-int packet_trim(packet_t packet, size_t prefix, size_t suffix)
+int packet_trim(packet_t *packet, size_t prefix, size_t suffix)
 {
         if (!packet_is_valid(packet))
@@ -143 +143 @@
  * @return              Zero if the packet is not valid.
  */
-packet_id_t packet_get_id(const packet_t packet)
+packet_id_t packet_get_id(const packet_t *packet)
 {
         return packet_is_valid(packet) ? packet->packet_id : 0;
@@ -157 +157 @@
  * @return              EINVAL if the packet is not valid.
  */
-int packet_get_addr(const packet_t packet, uint8_t **src, uint8_t **dest)
+int packet_get_addr(const packet_t *packet, uint8_t **src, uint8_t **dest)
 {
         if (!packet_is_valid(packet))
@@ -177 +177 @@
  * @return              Zero if the packet is not valid.
  */
-size_t packet_get_data_length(const packet_t packet)
+size_t packet_get_data_length(const packet_t *packet)
 {
         if (!packet_is_valid(packet))
@@ -191 +191 @@
  * @return              NULL if the packet is not valid.
  */
-void *packet_get_data(const packet_t packet)
+void *packet_get_data(const packet_t *packet)
 {
         if (!packet_is_valid(packet))
@@ -210 +210 @@
  */
 int
-packet_set_addr(packet_t packet, const uint8_t *src, const uint8_t *dest,
+packet_set_addr(packet_t *packet, const uint8_t *src, const uint8_t *dest,
     size_t addr_len)
 {
@@ -257 +257 @@
  * @return              NULL on error.
  */
-packet_t packet_get_copy(int phone, packet_t packet)
-{
-        packet_t copy;
+packet_t *packet_get_copy(int phone, packet_t *packet)
+{
+        packet_t *copy;
         uint8_t * src = NULL;
         uint8_t * dest = NULL;