Changeset 1a1a735 in mainline for uspace/lib/gpt/libgpt.c

Timestamp:

2013-07-26T18:29:51Z (12 years ago)

Author:

Dominik Taborsky (AT DOT) <brembyseznamcz>

Branches:

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

Children:

903a897, 9f4650c

Parents:

9bdfde73 (diff), 8559fa0 (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:

libgpt fixes

File:

• uspace/lib/gpt/libgpt.c (modified) (7 diffs)

uspace/lib/gpt/libgpt.c

@@ -127 +127 @@
         rc = block_init(EXCHANGE_ATOMIC, dev_handle, 512);
         if (rc != EOK)
-                return rc;
+                goto fail;
         
         rc = block_get_bsize(dev_handle, &b_size);
         if (rc != EOK)
-                return rc;
+                goto fini_fail;
         
         if (label->gpt == NULL) {
                 label->gpt = gpt_alloc_header(b_size);
-                if (label->gpt == NULL)
-                        return ENOMEM;
+                if (label->gpt == NULL) {
+                        rc = ENOMEM;
+                        goto fini_fail;
+                }
         }
         
@@ -144 +146 @@
                 rc = block_get_nblocks(dev_handle, &n_blocks);
                 if (rc != EOK)
-                        goto fail;
+                        goto free_fail;
 
                 rc = load_and_check_header(dev_handle, n_blocks - 1, b_size, label->gpt->header);
                 if (rc == EBADCHECKSUM || rc == EINVAL)
-                        goto fail;
+                        goto free_fail;
         }
         
@@ -155 +157 @@
         return EOK;
         
-fail:
-        block_fini(dev_handle);
+free_fail:
         gpt_free_gpt(label->gpt);
         label->gpt = NULL;
+fini_fail:
+        block_fini(dev_handle);
+fail:
         return rc;
 }
@@ -240 +244 @@
          *  - we don't need more bytes
          *  - the size of GPT partition entry can be different to 128 bytes */
+        /* comm_size is ignored */
         rc = block_init(EXCHANGE_SERIALIZE, label->device, sizeof(gpt_entry_t));
         if (rc != EOK)
@@ -247 +252 @@
         rc = block_get_bsize(label->device, &block_size);
         if (rc != EOK)
-                goto fail;
+                goto fini_fail;
 
         //size_t bufpos = 0;
@@ -266 +271 @@
 
                 if (rc != EOK)
-                        goto fail;
+                        goto fini_fail;
         }
 
@@ -274 +279 @@
          * on all of the partition entry array.
          */
-        uint32_t crc = compute_crc32((uint8_t *) label->parts->part_array, label->parts->fill * sizeof(gpt_entry_t));
+        uint32_t crc = compute_crc32((uint8_t *) label->parts->part_array, 
+                           label->parts->fill * sizeof(gpt_entry_t));
 
         if(uint32_t_le2host(label->gpt->header->pe_array_crc32) != crc)
         {
                 rc = EBADCHECKSUM;
-                goto fail;
-        }
-
+                goto fini_fail;
+        }
+        
+        block_fini(label->device);
         return EOK;
+        
+fini_fail:
+        block_fini(label->device);
         
 fail: