Changeset 271e24a in mainline for uspace/lib/gpt/libgpt.c

Timestamp:

2013-03-24T00:12:25Z (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:

30440ed

Parents:

ec50ac4a

Message:

hdisk - testing libmbr

File:

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

uspace/lib/gpt/libgpt.c

@@ -52 +52 @@
 
 static int load_and_check_header(service_id_t handle, aoff64_t addr, size_t b_size, gpt_header_t * header);
-static gpt_parts_t * alloc_part_array(uint32_t num);
-static int extend_part_array(gpt_parts_t * p);
-static int reduce_part_array(gpt_parts_t * p);
+static gpt_partitions_t * alloc_part_array(uint32_t num);
+static int extend_part_array(gpt_partitions_t * p);
+static int reduce_part_array(gpt_partitions_t * p);
 static long long nearest_larger_int(double a);
 
@@ -162 +162 @@
  *                              error code is stored in errno
  */
-gpt_parts_t * gpt_read_partitions(gpt_t * gpt)
+gpt_partitions_t * gpt_read_partitions(gpt_t * gpt)
 {
         int rc;
         unsigned int i;
-        gpt_parts_t * res;
+        gpt_partitions_t * res;
         uint32_t num_ent = uint32_t_le2host(gpt->raw_data->num_entries);
         uint32_t ent_size = uint32_t_le2host(gpt->raw_data->entry_size);
@@ -242 +242 @@
  * @return                              returns EOK on succes, specific error code otherwise
  */
-int gpt_write_partitions(gpt_parts_t * parts, gpt_t * gpt, service_id_t dev_handle)
+int gpt_write_partitions(gpt_partitions_t * parts, gpt_t * gpt, service_id_t dev_handle)
 {
         int rc;
@@ -283 +283 @@
 }
 
-gpt_parts_t * gpt_add_partition(gpt_parts_t * parts, g_part_t * partition)
-{
-        
-}
-
-gpt_parts_t * gpt_remove_partition(gpt_parts_t * parts, int idx)
-{
-        
+gpt_partitions_t * gpt_add_partition(gpt_partitions_t * parts, gpt_part_t * partition)
+{
+        
+        extend_part_array(parts);
+        return parts;
+}
+
+gpt_partitions_t * gpt_remove_partition(gpt_partitions_t * parts, size_t idx)
+{
+        reduce_part_array(parts);
+        return parts;
 }
 
@@ -304 +307 @@
  * @param parts         partition list to be freed
  */
-void gpt_free_partitions(gpt_parts_t * parts)
+void gpt_free_partitions(gpt_partitions_t * parts)
 {
         free(parts->part_array);
@@ -316 +319 @@
  * 
  */
-void gpt_set_part_type(g_part_t * p, int type)
+void gpt_set_part_type(gpt_part_t * p, int type)
 {
         /* Beware: first 3 blocks are byteswapped! */
@@ -386 +389 @@
 }
 
-static gpt_parts_t * alloc_part_array(uint32_t num)
-{
-        gpt_parts_t * res = malloc(sizeof(gpt_parts_t));
+static gpt_partitions_t * alloc_part_array(uint32_t num)
+{
+        gpt_partitions_t * res = malloc(sizeof(gpt_partitions_t));
         if (res == NULL) {
                 errno = ENOMEM;
@@ -408 +411 @@
 }
 
-static int extend_part_array(gpt_parts_t * p)
+static int extend_part_array(gpt_partitions_t * p)
 {
         unsigned int nsize = p->arr_size * 2;
@@ -425 +428 @@
 }
 
-static int reduce_part_array(gpt_parts_t * p)
+static int reduce_part_array(gpt_partitions_t * p)
 {
         if(p->arr_size > GPT_MIN_PART_NUM) {