Attachment 9047 Details for Bug 20264 – simplify using typemap

[patch] simplify using typemap

0001-WIP-use-a-typemap-for-PedDisk.patch (text/plain), 2.78 KB, created by Thierry Vignaud on 2017-03-08 18:18:23 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Vignaud

Created: 2017-03-08 18:18:23 CET

Size: 2.78 KB

patch

obsolete

>From 4fbb894b82115300c81d1ec2706375cc8217ede8 Mon Sep 17 00:00:00 2001
>From: Thierry Vignaud <thierry.vignaud@gmail.com>
>Date: Wed, 8 Mar 2017 17:13:31 +0100
>Subject: [PATCH] WIP: use a typemap for PedDisk
>
>---
> perl-install/c/stuff.xs.pl | 23 ++++++++++++-----------
> 1 file changed, 12 insertions(+), 11 deletions(-)
>
>diff --git a/perl-install/c/stuff.xs.pl b/perl-install/c/stuff.xs.pl
>index 9997d2e..0e52e6f 100755
>--- a/perl-install/c/stuff.xs.pl
>+++ b/perl-install/c/stuff.xs.pl
>@@ -610,11 +610,16 @@ get_iso_volume_ids(int fd)
> 
> print '
> 
>+TYPEMAP: <<HERE
>+PedDisk*              T_PTROBJ
>+HERE
>+
>+
>+
> int
>-set_partition_flag(void * ped_disk, int part_number, char * type)
>+set_partition_flag(PedDisk *disk, int part_number, char * type)
>   CODE:
>   RETVAL = 0;
>-  PedDisk* disk = (PedDisk *)ped_disk;
>   PedPartition* part = ped_disk_get_partition(disk, part_number);
>   if (!part) {
>     printf("set_partition_flag: failed to find partition\n");
>@@ -693,7 +698,7 @@ get_disk_partitions(char * device_path)
>     ped_disk_destroy(disk);
>   }
> 
>-void *
>+PedDisk*
> disk_open(char * device_path, const char * type_name = NULL)
>   CODE:
>   PedDevice *dev = ped_device_get(device_path);
>@@ -712,10 +717,9 @@ disk_open(char * device_path, const char * type_name = NULL)
>   RETVAL
> 
> int
>-disk_delete_all(void * ped_disk)
>+disk_delete_all(PedDisk* disk)
>   CODE:
>   RETVAL = 0;
>-  PedDisk* disk = (PedDisk *)ped_disk;
>   if (ped_disk_delete_all(disk)) {
>     RETVAL = 1;
>   }
>@@ -723,10 +727,9 @@ disk_delete_all(void * ped_disk)
>   RETVAL
> 
> int
>-disk_del_partition(void * ped_disk, int part_number)
>+disk_del_partition(PedDisk* disk, int part_number)
>   CODE:
>   RETVAL = 0;
>-  PedDisk* disk = (PedDisk *)ped_disk;
>   PedPartition* part = ped_disk_get_partition(disk, part_number);
>   if(!part) {
>     printf("disk_del_partition: failed to find partition\n");
>@@ -737,10 +740,9 @@ disk_del_partition(void * ped_disk, int part_number)
>   RETVAL
> 
> int
>-disk_add_partition(void * ped_disk, double start, double length, const char * fs_type)
>+disk_add_partition(PedDisk* disk, double start, double length, const char * fs_type)
>   CODE:
>   RETVAL=0;
>-  PedDisk* disk = (PedDisk *)ped_disk;
>   PedGeometry* geom = ped_geometry_new(disk->dev, (long long)start, (long long)length);
>   PedPartition* part = ped_partition_new (disk, PED_PARTITION_NORMAL, ped_file_system_type_get(fs_type), (long long)start, (long long)start+length-1);
>   PedConstraint* constraint = ped_constraint_new_from_max(geom);
>@@ -755,10 +757,9 @@ disk_add_partition(void * ped_disk, double start, double length, const char * fs
>   RETVAL
> 
> int
>-disk_commit(void * ped_disk)
>+disk_commit(PedDisk *disk)
>   CODE:
>   RETVAL = 0;
>-  PedDisk* disk = (PedDisk *)ped_disk;
>   if (ped_disk_commit_to_dev(disk)) {
>     RETVAL = 1;
>     if (ped_disk_commit_to_os(disk)) {
>-- 
>2.10.2
>

From 4fbb894b82115300c81d1ec2706375cc8217ede8 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Wed, 8 Mar 2017 17:13:31 +0100
Subject: [PATCH] WIP: use a typemap for PedDisk

---
 perl-install/c/stuff.xs.pl | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/perl-install/c/stuff.xs.pl b/perl-install/c/stuff.xs.pl
index 9997d2e..0e52e6f 100755
--- a/perl-install/c/stuff.xs.pl
+++ b/perl-install/c/stuff.xs.pl
@@ -610,11 +610,16 @@ get_iso_volume_ids(int fd)
 
 print '
 
+TYPEMAP: <<HERE
+PedDisk*              T_PTROBJ
+HERE
+
+
+
 int
-set_partition_flag(void * ped_disk, int part_number, char * type)
+set_partition_flag(PedDisk *disk, int part_number, char * type)
   CODE:
   RETVAL = 0;
-  PedDisk* disk = (PedDisk *)ped_disk;
   PedPartition* part = ped_disk_get_partition(disk, part_number);
   if (!part) {
     printf("set_partition_flag: failed to find partition\n");
@@ -693,7 +698,7 @@ get_disk_partitions(char * device_path)
     ped_disk_destroy(disk);
   }
 
-void *
+PedDisk*
 disk_open(char * device_path, const char * type_name = NULL)
   CODE:
   PedDevice *dev = ped_device_get(device_path);
@@ -712,10 +717,9 @@ disk_open(char * device_path, const char * type_name = NULL)
   RETVAL
 
 int
-disk_delete_all(void * ped_disk)
+disk_delete_all(PedDisk* disk)
   CODE:
   RETVAL = 0;
-  PedDisk* disk = (PedDisk *)ped_disk;
   if (ped_disk_delete_all(disk)) {
     RETVAL = 1;
   }
@@ -723,10 +727,9 @@ disk_delete_all(void * ped_disk)
   RETVAL
 
 int
-disk_del_partition(void * ped_disk, int part_number)
+disk_del_partition(PedDisk* disk, int part_number)
   CODE:
   RETVAL = 0;
-  PedDisk* disk = (PedDisk *)ped_disk;
   PedPartition* part = ped_disk_get_partition(disk, part_number);
   if(!part) {
     printf("disk_del_partition: failed to find partition\n");
@@ -737,10 +740,9 @@ disk_del_partition(void * ped_disk, int part_number)
   RETVAL
 
 int
-disk_add_partition(void * ped_disk, double start, double length, const char * fs_type)
+disk_add_partition(PedDisk* disk, double start, double length, const char * fs_type)
   CODE:
   RETVAL=0;
-  PedDisk* disk = (PedDisk *)ped_disk;
   PedGeometry* geom = ped_geometry_new(disk->dev, (long long)start, (long long)length);
   PedPartition* part = ped_partition_new (disk, PED_PARTITION_NORMAL, ped_file_system_type_get(fs_type), (long long)start, (long long)start+length-1);
   PedConstraint* constraint = ped_constraint_new_from_max(geom);
@@ -755,10 +757,9 @@ disk_add_partition(void * ped_disk, double start, double length, const char * fs
   RETVAL
 
 int
-disk_commit(void * ped_disk)
+disk_commit(PedDisk *disk)
   CODE:
   RETVAL = 0;
-  PedDisk* disk = (PedDisk *)ped_disk;
   if (ped_disk_commit_to_dev(disk)) {
     RETVAL = 1;
     if (ped_disk_commit_to_os(disk)) {
-- 
2.10.2

Actions: View | Diff

Attachments on bug 20264: 9028 | 9029 | 9030 | 9031 | 9037 | 9038 | 9039 | 9040 | 9041 | 9042 | 9043 | 9047 | 9054 | 9055 | 9060 | 9082