Changeset efdfebc in mainline for uspace/srv/net/udp/udp.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/udp.c (modified) (3 diffs)

uspace/srv/net/udp/udp.c

@@ -50 +50 @@
         int rc;
 
-        log_msg(LVL_DEBUG, "udp_init()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_init()");
 
         rc = udp_inet_init();
         if (rc != EOK) {
-                log_msg(LVL_ERROR, "Failed connecting to internet service.");
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed connecting to internet service.");
                 return ENOENT;
         }
@@ -60 +60 @@
         rc = udp_sock_init();
         if (rc != EOK) {
-                log_msg(LVL_ERROR, "Failed initializing socket service.");
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed initializing socket service.");
                 return ENOENT;
         }
@@ -73 +73 @@
         printf(NAME ": UDP (User Datagram Protocol) service\n");
 
-        rc = log_init(NAME, LVL_DEBUG);
+        rc = log_init(NAME);
         if (rc != EOK) {
                 printf(NAME ": Failed to initialize log.\n");