Changeset efdfebc in mainline for uspace/srv/net/udp/ucall.c

Timestamp:

2012-11-06T21:03:44Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

338810f

Parents:

de73242 (diff), 94795812 (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/udp/ucall.c (modified) (7 diffs)

uspace/srv/net/udp/ucall.c

@@ -47 +47 @@
         udp_assoc_t *nassoc;
 
-        log_msg(LVL_DEBUG, "udp_uc_create()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_uc_create()");
         nassoc = udp_assoc_new(NULL, NULL);
         if (nassoc == NULL)
@@ -59 +59 @@
 udp_error_t udp_uc_set_foreign(udp_assoc_t *assoc, udp_sock_t *fsock)
 {
-        log_msg(LVL_DEBUG, "udp_uc_set_foreign(%p, %p)", assoc, fsock);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_uc_set_foreign(%p, %p)", assoc, fsock);
 
         udp_assoc_set_foreign(assoc, fsock);
@@ -67 +67 @@
 udp_error_t udp_uc_set_local(udp_assoc_t *assoc, udp_sock_t *lsock)
 {
-        log_msg(LVL_DEBUG, "udp_uc_set_local(%p, %p)", assoc, lsock);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_uc_set_local(%p, %p)", assoc, lsock);
 
         udp_assoc_set_local(assoc, lsock);
@@ -79 +79 @@
         udp_msg_t msg;
 
-        log_msg(LVL_DEBUG, "%s: udp_uc_send()", assoc->name);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: udp_uc_send()", assoc->name);
 
         msg.data = data;
@@ -103 +103 @@
         int rc;
 
-        log_msg(LVL_DEBUG, "%s: udp_uc_receive()", assoc->name);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: udp_uc_receive()", assoc->name);
         rc = udp_assoc_recv(assoc, &msg, fsock);
         switch (rc) {
@@ -118 +118 @@
 void udp_uc_status(udp_assoc_t *assoc, udp_assoc_status_t *astatus)
 {
-        log_msg(LVL_DEBUG, "udp_uc_status()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_uc_status()");
 //      cstatus->cstate = conn->cstate;
 }
@@ -124 +124 @@
 void udp_uc_destroy(udp_assoc_t *assoc)
 {
-        log_msg(LVL_DEBUG, "udp_uc_destroy()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_uc_destroy()");
         udp_assoc_remove(assoc);
         udp_assoc_delete(assoc);