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

Timestamp:

2012-09-04T19:48:22Z (13 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.h (modified) (2 diffs)

uspace/srv/fs/udf/udf_file.h

@@ -197 +197 @@
 extern int udf_read_allocation_sequence(udf_node_t *, uint8_t *, uint16_t,
     uint32_t, uint32_t);
-extern int udf_read_extended_allocator(udf_node_t *, uint16_t, uint32_t);
 extern int udf_read_file(size_t *, ipc_callid_t, udf_node_t *, aoff64_t,
     size_t);
 extern int udf_get_fid(udf_file_identifier_descriptor_t **, block_t **,
-    udf_node_t *, aoff64_t);
-extern int udf_get_fid_in_data(udf_file_identifier_descriptor_t **,
     udf_node_t *, aoff64_t);
 extern int udf_get_fid_in_allocator(udf_file_identifier_descriptor_t **,
@@ -208 +205 @@
 extern int udf_get_fid_in_sector(udf_file_identifier_descriptor_t **,
     block_t **, udf_node_t *, aoff64_t, size_t *, void **, size_t *);
-extern int udf_read_free_space(uint8_t *, uint16_t, uint32_t, uint32_t);
-extern int udf_read_unallocated_space_entry(udf_instance_t *, uint64_t,
-    uint32_t);
 
 #endif /* UDF_FILE_H_ */