Changeset b800b0e in mainline for uspace/srv/fs/udf/udf_file.c

Timestamp:

2012-10-23T13:16:49Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

6ecf5b8

Parents:

32b3a12 (diff), b2ac3998 (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_file.c (modified) (7 diffs)

uspace/srv/fs/udf/udf_file.c

@@ -71 +71 @@
             FLE32(exd->extent_location.lblock_num);
         
-        log_msg(LVL_DEBUG,
+        log_msg(LOG_DEFAULT, LVL_DEBUG,
             "Extended allocator: start=%d, block_num=%d, len=%d", start,
             FLE32(exd->extent_location.lblock_num), FLE32(exd->info_length));
@@ -100 +100 @@
         switch (icb_flag) {
         case UDF_SHORT_AD:
-                log_msg(LVL_DEBUG,
+                log_msg(LOG_DEFAULT, LVL_DEBUG,
                     "ICB: sequence of allocation descriptors - icbflag = short_ad_t");
                 
@@ -167 +167 @@
                 
         case UDF_LONG_AD:
-                log_msg(LVL_DEBUG,
+                log_msg(LOG_DEFAULT, LVL_DEBUG,
                     "ICB: sequence of allocation descriptors - icbflag = long_ad_t");
                 
@@ -203 +203 @@
                 
         case UDF_EXTENDED_AD:
-                log_msg(LVL_DEBUG,
+                log_msg(LOG_DEFAULT, LVL_DEBUG,
                     "ICB: sequence of allocation descriptors - icbflag = extended_ad_t");
                 break;
                 
         case UDF_DATA_AD:
-                log_msg(LVL_DEBUG,
+                log_msg(LOG_DEFAULT, LVL_DEBUG,
                     "ICB: sequence of allocation descriptors - icbflag = 3, node contains data itself");
                 
@@ -253 +253 @@
                 switch (FLE16(data->id)) {
                 case UDF_FILE_ENTRY:
-                        log_msg(LVL_DEBUG, "ICB: File entry descriptor found");
+                        log_msg(LOG_DEFAULT, LVL_DEBUG, "ICB: File entry descriptor found");
                         
                         udf_file_entry_descriptor_t *file =
@@ -267 +267 @@
                         
                 case UDF_EFILE_ENTRY:
-                        log_msg(LVL_DEBUG, "ICB: Extended file entry descriptor found");
+                        log_msg(LOG_DEFAULT, LVL_DEBUG, "ICB: Extended file entry descriptor found");
                         
                         udf_extended_file_entry_descriptor_t *efile =
@@ -281 +281 @@
                         
                 case UDF_ICB_TERMINAL:
-                        log_msg(LVL_DEBUG, "ICB: Terminal entry descriptor found");
+                        log_msg(LOG_DEFAULT, LVL_DEBUG, "ICB: Terminal entry descriptor found");
                         block_put(block);
                         return EOK;