Changeset 8e7c9fe in mainline for uspace/srv/net/dnsrsrv/dns_msg.c

Timestamp:

2014-09-12T03:45:25Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (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

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

• uspace/srv/net/dnsrsrv/dns_msg.c (modified) (3 diffs)

uspace/srv/net/dnsrsrv/dns_msg.c

@@ -487 +487 @@
         size_t size;
         dns_header_t hdr;
-        size_t q_size;
+        size_t q_size = 0;
         size_t di;
         int rc;
@@ -515 +515 @@
                         return rc;
 
+                assert(q_size > 0);
+
                 size += q_size;
         }
@@ -532 +534 @@
                         return rc;
                 }
+
+                assert(q_size > 0);
 
                 di += q_size;