Changeset 3f03199 in mainline for uspace/srv/net/dnsrsrv/dns_msg.c

Timestamp:

2013-09-15T06:33:53Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9348862

Parents:

dd7078c (diff), 1c0cef0 (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.

Major conflicts in USB HC drivers.
Compiles and UHCI works (qemu).
OHCI has device remove problems.

File:

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

uspace/srv/net/dnsrsrv/dns_msg.c

@@ -510 +510 @@
         size = sizeof(dns_header_t);
 
-        list_foreach(msg->question, link) {
-                dns_question_t *q = list_get_instance(link, dns_question_t, msg);
+        list_foreach(msg->question, msg, dns_question_t, q) {
                 rc = dns_question_encode(q, NULL, 0, &q_size);
                 if (rc != EOK)
@@ -526 +525 @@
         di = sizeof(dns_header_t);
 
-        list_foreach(msg->question, link) {
-                dns_question_t *q = list_get_instance(link, dns_question_t, msg);
+        list_foreach(msg->question, msg, dns_question_t, q) {
                 rc = dns_question_encode(q, data + di, size - di, &q_size);
                 if (rc != EOK) {