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

uspace/srv/net/loopip/loopip.c

@@ -75 +75 @@
 {
         while (true) {
-                log_msg(LVL_DEBUG, "loopip_recv_fibril(): Wait for one item");
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "loopip_recv_fibril(): Wait for one item");
                 link_t *link = prodcons_consume(&loopip_rcv_queue);
                 rqueue_entry_t *rqe = list_get_instance(link, rqueue_entry_t, link);
@@ -96 +96 @@
         rc = loc_server_register(NAME);
         if (rc != EOK) {
-                log_msg(LVL_ERROR, "Failed registering server.");
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering server.");
                 return rc;
         }
@@ -108 +108 @@
         rc = loc_service_register(svc_name, &sid);
         if (rc != EOK) {
-                log_msg(LVL_ERROR, "Failed registering service %s.", svc_name);
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service %s.", svc_name);
                 return rc;
         }
@@ -114 +114 @@
         rc = loc_category_get_id("iplink", &iplink_cat, IPC_FLAG_BLOCKING);
         if (rc != EOK) {
-                log_msg(LVL_ERROR, "Failed resolving category 'iplink'.");
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed resolving category 'iplink'.");
                 return rc;
         }
@@ -120 +120 @@
         rc = loc_service_add_to_cat(sid, iplink_cat);
         if (rc != EOK) {
-                log_msg(LVL_ERROR, "Failed adding %s to category.", svc_name);
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed adding %s to category.", svc_name);
                 return rc;
         }
@@ -135 +135 @@
 static void loopip_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
-        log_msg(LVL_DEBUG, "loopip_client_conn()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "loopip_client_conn()");
         iplink_conn(iid, icall, &loopip_iplink);
 }
@@ -141 +141 @@
 static int loopip_open(iplink_srv_t *srv)
 {
-        log_msg(LVL_DEBUG, "loopip_open()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "loopip_open()");
         return EOK;
 }
@@ -147 +147 @@
 static int loopip_close(iplink_srv_t *srv)
 {
-        log_msg(LVL_DEBUG, "loopip_close()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "loopip_close()");
         return EOK;
 }
@@ -155 +155 @@
         rqueue_entry_t *rqe;
 
-        log_msg(LVL_DEBUG, "loopip_send()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "loopip_send()");
 
         rqe = calloc(1, sizeof(rqueue_entry_t));
@@ -184 +184 @@
 static int loopip_get_mtu(iplink_srv_t *srv, size_t *mtu)
 {
-        log_msg(LVL_DEBUG, "loopip_get_mtu()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "loopip_get_mtu()");
         *mtu = 1500;
         return EOK;
@@ -191 +191 @@
 static int loopip_addr_add(iplink_srv_t *srv, iplink_srv_addr_t *addr)
 {
-        log_msg(LVL_DEBUG, "loopip_addr_add(0x%" PRIx32 ")", addr->ipv4);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "loopip_addr_add(0x%" PRIx32 ")", addr->ipv4);
         return EOK;
 }
@@ -197 +197 @@
 static int loopip_addr_remove(iplink_srv_t *srv, iplink_srv_addr_t *addr)
 {
-        log_msg(LVL_DEBUG, "loopip_addr_remove(0x%" PRIx32 ")", addr->ipv4);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "loopip_addr_remove(0x%" PRIx32 ")", addr->ipv4);
         return EOK;
 }
@@ -207 +207 @@
         printf(NAME ": HelenOS loopback IP link provider\n");
 
-        if (log_init(NAME, LVL_WARN) != EOK) {
+        if (log_init(NAME) != EOK) {
                 printf(NAME ": Failed to initialize logging.\n");
                 return 1;