Changes in uspace/srv/fs/udf/udf_file.c [38d150e:b7fd2a0] in mainline

File:

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

uspace/srv/fs/udf/udf_file.c

@@ -54 +54 @@
  * @param pos      Position with which we read
  *
- * @return EOK on success or a negative error code.
- *
- */
-static int udf_read_extended_allocator(udf_node_t *node, uint16_t icb_flag,
+ * @return EOK on success or an error code.
+ *
+ */
+static errno_t udf_read_extended_allocator(udf_node_t *node, uint16_t icb_flag,
     uint32_t pos)
 {
         block_t *block = NULL;
-        int rc = block_get(&block, node->instance->service_id, pos,
+        errno_t rc = block_get(&block, node->instance->service_id, pos,
             BLOCK_FLAGS_NONE);
         if (rc != EOK)
@@ -90 +90 @@
  * @param len         Length of sequence
  *
- * @return EOK on success or a negative error code.
- *
- */
-int udf_read_allocation_sequence(udf_node_t *node, uint8_t *af,
+ * @return EOK on success or an error code.
+ *
+ */
+errno_t udf_read_allocation_sequence(udf_node_t *node, uint8_t *af,
     uint16_t icb_flag, uint32_t start_alloc, uint32_t len)
 {
@@ -231 +231 @@
  * @param node    UDF node
  *
- * @return    EOK on success or a negative error code.
- */
-int udf_read_icb(udf_node_t *node)
+ * @return    EOK on success or an error code.
+ */
+errno_t udf_read_icb(udf_node_t *node)
 {
         while (true) {
@@ -239 +239 @@
                 
                 block_t *block = NULL;
-                int rc = block_get(&block, node->instance->service_id, pos,
+                errno_t rc = block_get(&block, node->instance->service_id, pos,
                     BLOCK_FLAGS_NONE);
                 if (rc != EOK)
@@ -300 +300 @@
  * @param node UDF node
  *
- * @return EOK on success or a negative error code.
- *
- */
-int udf_node_get_core(udf_node_t *node)
+ * @return EOK on success or an error code.
+ *
+ */
+errno_t udf_node_get_core(udf_node_t *node)
 {
         node->link_cnt = 1;
@@ -315 +315 @@
  * @param pos  Number of FID which we need to find
  *
- * @return EOK on success or a negative error code.
- *
- */
-static int udf_get_fid_in_data(udf_file_identifier_descriptor_t **fid,
+ * @return EOK on success or an error code.
+ *
+ */
+static errno_t udf_get_fid_in_data(udf_file_identifier_descriptor_t **fid,
     udf_node_t *node, aoff64_t pos)
 {
@@ -366 +366 @@
  * @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,
+ * @return EOK on success or an error code.
+ *
+ */
+errno_t udf_get_fid(udf_file_identifier_descriptor_t **fid, block_t **block,
     udf_node_t *node, aoff64_t pos)
 {
@@ -385 +385 @@
  * @param pos   Number of FID which we need to find
  *
- * @return EOK on success or a negative error code.
- *
- */
-int udf_get_fid_in_allocator(udf_file_identifier_descriptor_t **fid,
+ * @return EOK on success or an error code.
+ *
+ */
+errno_t udf_get_fid_in_allocator(udf_file_identifier_descriptor_t **fid,
     block_t **block, udf_node_t *node, aoff64_t pos)
 {
@@ -402 +402 @@
                 size_t i = 0;
                 while (i * node->instance->sector_size < node->allocators[j].length) {
-                        int rc = block_get(block, node->instance->service_id,
+                        errno_t rc = block_get(block, node->instance->service_id,
                             node->allocators[j].position + i, BLOCK_FLAGS_NONE);
                         if (rc != EOK) {
@@ -466 +466 @@
  * @param len   Length of buf
  *
- * @return EOK on success or a negative error code.
- *
- */
-int udf_get_fid_in_sector(udf_file_identifier_descriptor_t **fid,
+ * @return EOK on success or an error code.
+ *
+ */
+errno_t udf_get_fid_in_sector(udf_file_identifier_descriptor_t **fid,
     block_t **block, udf_node_t *node, aoff64_t pos, size_t *n, void **buf,
     size_t *len)
@@ -573 +573 @@
  * @param len      Length of data for reading
  *
- * @return EOK on success or a negative error code.
- *
- */
-int udf_read_file(size_t *read_len, ipc_callid_t callid, udf_node_t *node,
+ * @return EOK on success or an error code.
+ *
+ */
+errno_t udf_read_file(size_t *read_len, ipc_callid_t callid, udf_node_t *node,
     aoff64_t pos, size_t len)
 {
@@ -594 +594 @@
         
         block_t *block = NULL;
-        int rc = block_get(&block, node->instance->service_id,
+        errno_t rc = block_get(&block, node->instance->service_id,
             node->allocators[i].position + (sector_num - sector_cnt),
             BLOCK_FLAGS_NONE);