Changeset 0773396 in mainline for uspace/srv/logger/logs.c

Timestamp:

2013-12-25T13:05:25Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

bc54126c

Parents:

f4a47e52 (diff), 6946f23 (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/logger/logs.c (modified) (3 diffs)

uspace/srv/logger/logs.c

@@ -44 +44 @@
 static logger_log_t *find_log_by_name_and_parent_no_list_lock(const char *name, logger_log_t *parent)
 {
-        list_foreach(log_list, it) {
-                logger_log_t *log = list_get_instance(it, logger_log_t, link);
+        list_foreach(log_list, link, logger_log_t, log) {
                 if ((parent == log->parent) && (str_cmp(log->name, name) == 0))
                         return log;
@@ -148 +147 @@
 
         fibril_mutex_lock(&log_list_guard);
-        list_foreach(log_list, it) {
-                logger_log_t *log = list_get_instance(it, logger_log_t, link);
+        list_foreach(log_list, link, logger_log_t, log) {
                 if (str_cmp(log->full_name, name) == 0) {
                         fibril_mutex_lock(&log->guard);
@@ -166 +164 @@
 
         fibril_mutex_lock(&log_list_guard);
-        list_foreach(log_list, it) {
-                logger_log_t *log = list_get_instance(it, logger_log_t, link);
+        list_foreach(log_list, link, logger_log_t, log) {
                 if ((sysarg_t) log == id) {
                         fibril_mutex_lock(&log->guard);