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

uspace/srv/net/inetsrv/addrobj.c

@@ -59 +59 @@
 
         if (addr == NULL) {
-                log_msg(LVL_ERROR, "Failed allocating address object. "
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed allocating address object. "
                     "Out of memory.");
                 return NULL;
@@ -114 +114 @@
         uint32_t mask;
 
-        log_msg(LVL_DEBUG, "inet_addrobj_find(%x)", (unsigned)addr->ipv4);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_addrobj_find(%x)", (unsigned)addr->ipv4);
 
         fibril_mutex_lock(&addr_list_lock);
@@ -125 +125 @@
                 if ((naddr->naddr.ipv4 & mask) == (addr->ipv4 & mask)) {
                         fibril_mutex_unlock(&addr_list_lock);
-                        log_msg(LVL_DEBUG, "inet_addrobj_find: found %p",
+                        log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_addrobj_find: found %p",
                             naddr);
                         return naddr;
@@ -131 +131 @@
         }
 
-        log_msg(LVL_DEBUG, "inet_addrobj_find: Not found");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_addrobj_find: Not found");
         fibril_mutex_unlock(&addr_list_lock);
 
@@ -147 +147 @@
         assert(fibril_mutex_is_locked(&addr_list_lock));
 
-        log_msg(LVL_DEBUG, "inet_addrobj_find_by_name_locked('%s', '%s')",
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_addrobj_find_by_name_locked('%s', '%s')",
             name, ilink->svc_name);
 
@@ -155 +155 @@
 
                 if (naddr->ilink == ilink && str_cmp(naddr->name, name) == 0) {
-                        log_msg(LVL_DEBUG, "inet_addrobj_find_by_name_locked: found %p",
+                        log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_addrobj_find_by_name_locked: found %p",
                             naddr);
                         return naddr;
@@ -161 +161 @@
         }
 
-        log_msg(LVL_DEBUG, "inet_addrobj_find_by_name_locked: Not found");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_addrobj_find_by_name_locked: Not found");
 
         return NULL;
@@ -177 +177 @@
         inet_addrobj_t *aobj;
 
-        log_msg(LVL_DEBUG, "inet_addrobj_find_by_name('%s', '%s')",
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_addrobj_find_by_name('%s', '%s')",
             name, ilink->svc_name);
 
@@ -194 +194 @@
 inet_addrobj_t *inet_addrobj_get_by_id(sysarg_t id)
 {
-        log_msg(LVL_DEBUG, "inet_addrobj_get_by_id(%zu)", (size_t)id);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_addrobj_get_by_id(%zu)", (size_t)id);
 
         fibril_mutex_lock(&addr_list_lock);