Changeset 0435fe41 in mainline for uspace/lib/gpt/libgpt.c

Timestamp:

2013-08-27T00:32:08Z (11 years ago)

Author:

Dominik Taborsky (AT DOT) <brembyseznamcz>

Branches:

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

Children:

61ab4a9, 802898f

Parents:

493b881

Message:

polishing libmbr, libgpt, hdisk

File:

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

uspace/lib/gpt/libgpt.c

@@ -48 +48 @@
 #include <checksum.h>
 #include <mem.h>
+#include <sys/typefmt.h>
+
 
 #include "libgpt.h"
@@ -55 +57 @@
 static int extend_part_array(gpt_partitions_t *);
 static int reduce_part_array(gpt_partitions_t *);
-//static long long nearest_larger_int(double);
 static uint8_t get_byte(const char *);
 static bool check_overlap(gpt_part_t *, gpt_part_t *);
@@ -313 +314 @@
                            fillries * ent_size);
 
-        if(uint32_t_le2host(label->gpt->header->pe_array_crc32) != crc)
+        if (uint32_t_le2host(label->gpt->header->pe_array_crc32) != crc)
         {
                 rc = EBADCHECKSUM;
@@ -369 +370 @@
         
         /* Perform checks */
-        gpt_part_foreach(label, p) {
+        gpt_part_foreach (label, p) {
                 if (gpt_get_part_type(p) == GPT_PTE_UNUSED)
                         continue;
@@ -375 +376 @@
                 if (!check_encaps(p, n_blocks, gpt_space)) {
                         rc = ERANGE;
-                        printf("encaps with: %llu, %llu, %llu\n", n_blocks, gpt_space, gpt_get_end_lba(p));
+                        printf("encaps with: %" PRIuOFF64 ", %" PRIu64 ", %" PRIu64 "\n", 
+                            n_blocks, gpt_space, gpt_get_end_lba(p));
                         goto fail;
                 }
                 
-                gpt_part_foreach(label, q) {
+                gpt_part_foreach (label, q) {
                         if (p == q)
                                 continue;
@@ -385 +387 @@
                         if (gpt_get_part_type(p) != GPT_PTE_UNUSED) {
                                 if (check_overlap(p, q)) {
-                                        printf("overlap with: %llu, %llu\n", gpt_get_start_lba(p), gpt_get_start_lba(q));
+                                        printf("overlap with: %" PRIu64 ", %" PRIu64 "\n", 
+                                            gpt_get_start_lba(p), gpt_get_start_lba(q));
                                         rc = ERANGE;
                                         goto fail;
@@ -709 +712 @@
 void gpt_set_random_uuid(uint8_t * uuid)
 {
-        srandom((unsigned int) uuid);
+        srandom((unsigned int) (size_t) uuid);
         
         unsigned int i;
@@ -786 +789 @@
         size_t nsize = p->arr_size * 2;
         gpt_entry_t * tmp = malloc(nsize * sizeof(gpt_entry_t));
-        if(tmp == NULL) {
+        if (tmp == NULL) {
                 errno = ENOMEM;
                 return -1;
@@ -801 +804 @@
 static int reduce_part_array(gpt_partitions_t * p)
 {
-        if(p->arr_size > GPT_MIN_PART_NUM) {
+        if (p->arr_size > GPT_MIN_PART_NUM) {
                 unsigned int nsize = p->arr_size / 2;
                 nsize = nsize > GPT_MIN_PART_NUM ? nsize : GPT_MIN_PART_NUM;
                 gpt_entry_t * tmp = malloc(nsize * sizeof(gpt_entry_t));
-                if(tmp == NULL)
+                if (tmp == NULL)
                         return ENOMEM;
 
@@ -816 +819 @@
         return 0;
 }
-
-/*static long long nearest_larger_int(double a)
-{
-        if ((long long) a == a) {
-                return (long long) a;
-        }
-
-        return ((long long) a) + 1;
-}*/
 
 /* Parse a byte from a string in hexadecimal