Changeset 70253688 in mainline for uspace/srv/net/tcp/conn.c

Timestamp:

2012-09-07T08:12:05Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

e0c836e8

Parents:

131d9a4 (diff), 8cf4823 (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/srv/net/tcp/conn.c (modified) (2 diffs)

uspace/srv/net/tcp/conn.c

@@ -999 +999 @@
         } else {
                 log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: Nothing left in segment, dropping "
-                    "(xfer_size=%zu, SEG.LEN=%zu, seg->ctrl=%u)",
-                    conn->name, xfer_size, seg->len, (unsigned)seg->ctrl);
+                    "(xfer_size=%zu, SEG.LEN=%" PRIu32 ", seg->ctrl=%u)",
+                    conn->name, xfer_size, seg->len, (unsigned int) seg->ctrl);
                 /* Nothing left in segment */
                 tcp_segment_delete(seg);
@@ -1146 +1146 @@
 void tcp_conn_segment_arrived(tcp_conn_t *conn, tcp_segment_t *seg)
 {
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "%c: tcp_conn_segment_arrived(%p)",
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: tcp_conn_segment_arrived(%p)",
             conn->name, seg);