Changeset 5a6cc679 in mainline for uspace/srv/net/inetsrv/reass.c

Timestamp:

2018-01-31T02:21:24Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

a0a9cc2

Parents:

132ab5d1

Message:

Merge commit '50f19b7ee8e94570b5c63896736c4eb49cfa18db' into forwardport

Not all ints are converted to errno_t in xhci tree yet, however it compiles and works

File:

• uspace/srv/net/inetsrv/reass.c (modified) (5 diffs)

uspace/srv/net/inetsrv/reass.c

@@ -70 +70 @@
 static reass_dgram_t *reass_dgram_new(void);
 static reass_dgram_t *reass_dgram_get(inet_packet_t *);
-static int reass_dgram_insert_frag(reass_dgram_t *, inet_packet_t *);
+static errno_t reass_dgram_insert_frag(reass_dgram_t *, inet_packet_t *);
 static bool reass_dgram_complete(reass_dgram_t *);
 static void reass_dgram_remove(reass_dgram_t *);
-static int reass_dgram_deliver(reass_dgram_t *);
+static errno_t reass_dgram_deliver(reass_dgram_t *);
 static void reass_dgram_destroy(reass_dgram_t *);
 
@@ -81 +81 @@
  * @return              EOK on success or ENOMEM.
  */
-int inet_reass_queue_packet(inet_packet_t *packet)
+errno_t inet_reass_queue_packet(inet_packet_t *packet)
 {
         reass_dgram_t *rdg;
-        int rc;
+        errno_t rc;
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_reass_queue_packet()");
@@ -180 +180 @@
 }
 
-static int reass_dgram_insert_frag(reass_dgram_t *rdg, inet_packet_t *packet)
+static errno_t reass_dgram_insert_frag(reass_dgram_t *rdg, inet_packet_t *packet)
 {
         reass_frag_t *frag;
@@ -290 +290 @@
  * @param rdg           Datagram reassembly structure.
  */
-static int reass_dgram_deliver(reass_dgram_t *rdg)
+static errno_t reass_dgram_deliver(reass_dgram_t *rdg)
 {
         size_t dgram_size;
@@ -297 +297 @@
         uint8_t proto;
         reass_frag_t *frag;
-        int rc;
+        errno_t rc;
 
         /*