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

Timestamp:

2012-09-04T19:48:22Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

78ca12b

Parents:

85f7369 (diff), 8ec4144 (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) (6 diffs)

uspace/srv/fs/udf/udf_file.c

@@ -57 +57 @@
  *
  */
-int udf_read_extended_allocator(udf_node_t *node, uint16_t icb_flag,
+static int udf_read_extended_allocator(udf_node_t *node, uint16_t icb_flag,
     uint32_t pos)
 {
@@ -185 +185 @@
                          */
                         if (FLE32(long_d->length) >> 30 == 3) {
-                                udf_read_extended_allocator (node, icb_flag, pos_long_ad);
+                                udf_read_extended_allocator(node, icb_flag, pos_long_ad);
                                 break;
                         }
@@ -296 +296 @@
 }
 
-/** Read ICB sequence of allocators in Unallocated space entry descriptor
- *
- * This function read ICB sequence if free space is saved by space table.
- * Not finished.
- *
- * @param uased       Unallocated space entry descriptor
- * @param icb_flag    Type of allocators in sequence.
- *                    According to ECMA 167 4/14.8.8
- * @param start_alloc Offset of the allocator
- * @param len         Length of sequence
- *
- * @return EOK on success or a negative error code.
- *
- */
-int udf_read_free_space(uint8_t *uased, uint16_t icb_flag,
-    uint32_t start_alloc, uint32_t len)
-{
-        switch (icb_flag) {
-        case UDF_SHORT_AD:
-                log_msg(LVL_DEBUG,
-                    "UAICB: sequence of allocation descriptors - icbflag = short_ad_t");
-                
-                /* Identify number of current partition */
-                
-                size_t cnt = len / sizeof(udf_short_ad_t);
-                size_t n = 0;
-                
-                while (n < cnt) {
-                        udf_short_ad_t *short_d =
-                            (udf_short_ad_t *) (uased + start_alloc + n * sizeof(udf_short_ad_t));
-                        
-                        if (short_d->length == 0)
-                                break;
-                        
-                        n++;
-                }
-                
-                break;
-                
-        case UDF_LONG_AD:
-                log_msg(LVL_DEBUG,
-                    "UAICB: sequence of allocation descriptors - icbflag = long_ad_t");
-                
-                cnt = len / sizeof(udf_long_ad_t);
-                n = 0;
-                
-                while (n < cnt) {
-                        udf_long_ad_t *long_d =
-                            (udf_long_ad_t *) (uased + start_alloc + n * sizeof(udf_long_ad_t));
-                        
-                        if (long_d->length == 0)
-                                break;
-                        
-                        n++;
-                }
-                
-                break;
-                
-        case UDF_EXTENDED_AD:
-                log_msg(LVL_DEBUG,
-                    "UAICB: sequence of allocation descriptors - icbflag = extended_ad_t");
-                break;
-                
-        case UDF_DATA_AD:
-                log_msg(LVL_DEBUG,
-                    "UAICB: sequence of allocation descriptors - icbflag = 3, node contains data itself");
-                break;
-        }
-        
-        return EOK;
-}
-
-/** Read Unallocated space entry descriptor
- *
- * Read ICB sequence if free space is saved by space table.
- * Not finished.
- *
- */
-int udf_read_unallocated_space_entry(udf_instance_t * instance, uint64_t pos,
-    uint32_t len)
-{
-        block_t *block = NULL;
-        int rc = block_get(&block, instance->service_id, pos, BLOCK_FLAGS_NONE);
-        if (rc != EOK)
-                return rc;
-        
-        udf_descriptor_tag_t *desc = (udf_descriptor_tag_t *) block->data;
-        if (desc->checksum != udf_tag_checksum((uint8_t *) desc)) {
-                block_put(block);
-                return EINVAL;
-        }
-        
-        if (FLE16(desc->id) != UDF_UASPACE_ENTRY) {
-                // FIXME: Memory leak
-                return EINVAL;
-        }
-        
-        udf_unallocated_space_entry_descriptor_t *uased =
-            (udf_unallocated_space_entry_descriptor_t *) block->data;
-        if (uased->icbtag.file_type != UDF_ICBTYPE_UASE) {
-                // FIXME: Memory leak
-                return EINVAL;
-        }
-        
-        uint16_t icb_flag = uased->icbtag.flags & UDF_ICBFLAG_MASK;
-        
-        rc = udf_read_free_space((uint8_t *) uased, icb_flag,
-            UDF_UASE_OFFSET, uased->ad_lenght);
-        
-        return block_put(block);
-}
-
 /** Read data from disk - filling UDF node by allocators
  *
@@ -419 +307 @@
         node->link_cnt = 1;
         return udf_read_icb(node);
-}
-
-/** Read directory entry
- *
- * @param fid   Returned value
- * @param block Returned value
- * @param node  UDF node
- * @param pos   Number of FID which we need to find
- *
- * @return EOK on success or a negative error code.
- *
- */
-int udf_get_fid(udf_file_identifier_descriptor_t **fid, block_t **block,
-    udf_node_t *node, aoff64_t pos)
-{
-        if (node->data == NULL)
-                return udf_get_fid_in_allocator(fid, block, node, pos);
-        
-        return udf_get_fid_in_data(fid, node, pos);
 }
 
@@ -449 +318 @@
  *
  */
-int udf_get_fid_in_data(udf_file_identifier_descriptor_t **fid,
+static int udf_get_fid_in_data(udf_file_identifier_descriptor_t **fid,
     udf_node_t *node, aoff64_t pos)
 {
@@ -488 +357 @@
         
         return ENOENT;
+}
+
+/** Read directory entry
+ *
+ * @param fid   Returned value
+ * @param block Returned value
+ * @param node  UDF node
+ * @param pos   Number of FID which we need to find
+ *
+ * @return EOK on success or a negative error code.
+ *
+ */
+int udf_get_fid(udf_file_identifier_descriptor_t **fid, block_t **block,
+    udf_node_t *node, aoff64_t pos)
+{
+        if (node->data == NULL)
+                return udf_get_fid_in_allocator(fid, block, node, pos);
+        
+        return udf_get_fid_in_data(fid, node, pos);
 }