Changeset f72ae3b in mainline

Timestamp:

2012-08-16T23:36:59Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

f039dba

Parents:

330a59f

Message:

log_create returns parent in case of errors

File:

• uspace/lib/c/generic/io/log.c (modified) (4 diffs)

uspace/lib/c/generic/io/log.c

@@ -195 +195 @@
 }
 
-/** Create logging context.
- *
- * This function always returns a valid context.
+/** Create a new (sub-) log.
+ *
+ * This function always returns a valid log_t. In case of errors,
+ * @c parent is returned and errors are silently ignored.
+ *
+ * @param name Log name under which message will be reported (appended to parents name).
+ * @param parent Parent log.
+ * @return Opaque identifier of the newly created log.
  */
 log_t log_create(const char *name, log_t parent)
@@ -204 +209 @@
         if (info == NULL)
                 return LOG_DEFAULT;
+        info->name = NULL;
 
         if (parent == LOG_DEFAULT) {
                 info->name = str_dup(name);
-                if (info->name == NULL) {
-                        free(info);
-                        return LOG_DEFAULT;
-                }
+                if (info->name == NULL)
+                        goto error;
                 info->top_log_id = default_top_log_id;
         } else {
@@ -216 +220 @@
                 int rc = asprintf(&info->name, "%s/%s",
                     parent_info->name, name);
-                if (rc < 0) {
-                        free(info);
-                        return LOG_DEFAULT;
-                }
+                if (rc < 0)
+                        goto error;
                 info->top_log_id = parent_info->top_log_id;
         }
@@ -245 +247 @@
         free(info->name);
         free(info);
-        return LOG_DEFAULT;
+        return parent;
 }