Changeset ca2d142 in mainline for uspace/srv/net/structures/packet/packet.c

Timestamp:

2010-02-18T10:00:30Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e326edc

Parents:

b8da2a3 (diff), 91478aa (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 from the networking branch.

File:

• uspace/srv/net/structures/packet/packet.c (modified) (3 diffs)

uspace/srv/net/structures/packet/packet.c

@@ -184 +184 @@
 }
 
-packet_t pq_add( packet_t first, packet_t packet, size_t order, size_t metric ){
+int pq_add( packet_t * first, packet_t packet, size_t order, size_t metric ){
         packet_t        item;
 
-        if( ! packet_is_valid( packet )) return NULL;
+        if(( ! first ) || ( ! packet_is_valid( packet ))) return EINVAL;
         pq_set_order( packet, order, metric );
-        if( packet_is_valid( first )){
-                item = first;
+        if( packet_is_valid( * first )){
+                item = * first;
                 do{
                         if( item->order < order ){
@@ -198 +198 @@
                                         item->next = packet->packet_id;
                                         packet->previous = item->packet_id;
-                                        return first;
+                                        return EOK;
                                 }
                         }else{
@@ -205 +205 @@
                                 item->previous = packet->packet_id;
                                 item = pm_find( packet->previous );
-                                if( item ) item->next = packet->packet_id;
-                                return item ? first : packet;
+                                if( item ){
+                                        item->next = packet->packet_id;
+                                }else{
+                                        * first = packet;
+                                }
+                                return EOK;
                         }
                 }while( packet_is_valid( item ));
         }
-        return packet;
+        * first = packet;
+        return EOK;
 }