Changes in uspace/srv/fs/udf/udf_file.c [5c702a8:cde999a] in mainline

File:

• uspace/srv/fs/udf/udf_file.c (modified) (17 diffs)

uspace/srv/fs/udf/udf_file.c

@@ -38 +38 @@
 #include <libfs.h>
 #include <errno.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <inttypes.h>
 #include <io/log.h>
@@ -54 +54 @@
  * @param pos      Position with which we read
  *
- * @return EOK on success or a negative error code.
+ * @return EOK on success or an error code.
  *
  */
@@ -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));
@@ -90 +90 @@
  * @param len         Length of sequence
  *
- * @return EOK on success or a negative error code.
+ * @return EOK on success or an error code.
  *
  */
@@ -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");
                 
@@ -231 +231 @@
  * @param node    UDF node
  *
- * @return    EOK on success or a negative error code.
+ * @return    EOK on success or an error code.
  */
 int udf_read_icb(udf_node_t *node)
@@ -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;
@@ -300 +300 @@
  * @param node UDF node
  *
- * @return EOK on success or a negative error code.
+ * @return EOK on success or an error code.
  *
  */
@@ -315 +315 @@
  * @param pos  Number of FID which we need to find
  *
- * @return EOK on success or a negative error code.
+ * @return EOK on success or an error code.
  *
  */
@@ -366 +366 @@
  * @param pos   Number of FID which we need to find
  *
- * @return EOK on success or a negative error code.
+ * @return EOK on success or an error code.
  *
  */
@@ -385 +385 @@
  * @param pos   Number of FID which we need to find
  *
- * @return EOK on success or a negative error code.
+ * @return EOK on success or an error code.
  *
  */
@@ -466 +466 @@
  * @param len   Length of buf
  *
- * @return EOK on success or a negative error code.
+ * @return EOK on success or an error code.
  *
  */
@@ -573 +573 @@
  * @param len      Length of data for reading
  *
- * @return EOK on success or a negative error code.
+ * @return EOK on success or an error code.
  *
  */