Changeset fedac2f in mainline for uspace/srv/fs/udf/udf.c

Timestamp:

2012-09-16T11:27:35Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

289fa65

Parents:

8930624 (diff), 00b4a68 (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/fs/udf/udf.c (modified) (5 diffs)

uspace/srv/fs/udf/udf.c

@@ -61 +61 @@
 int main(int argc, char *argv[])
 {
-        log_init(NAME, LVL_NOTE);
-        log_msg(LVL_NOTE, "HelenOS UDF 1.02 file system server");
+        log_init(NAME);
+        log_msg(LOG_DEFAULT, LVL_NOTE, "HelenOS UDF 1.02 file system server");
         
         if (argc == 3) {
@@ -68 +68 @@
                         udf_vfs_info.instance = strtol(argv[2], NULL, 10);
                 else {
-                        log_msg(LVL_FATAL, "Unrecognized parameters");
+                        log_msg(LOG_DEFAULT, LVL_FATAL, "Unrecognized parameters");
                         return 1;
                 }
@@ -76 +76 @@
             service_connect_blocking(EXCHANGE_SERIALIZE, SERVICE_VFS, 0, 0);
         if (!vfs_sess) {
-                log_msg(LVL_FATAL, "Failed to connect to VFS");
+                log_msg(LOG_DEFAULT, LVL_FATAL, "Failed to connect to VFS");
                 return 2;
         }
@@ -89 +89 @@
                 goto err;
         
-        log_msg(LVL_NOTE, "Accepting connections");
+        log_msg(LOG_DEFAULT, LVL_NOTE, "Accepting connections");
         task_retval(0);
         async_manager();
@@ -97 +97 @@
         
 err:
-        log_msg(LVL_FATAL, "Failed to register file system (%d)", rc);
+        log_msg(LOG_DEFAULT, LVL_FATAL, "Failed to register file system (%d)", rc);
         return rc;
 }