SOURCES: parted-aix.patch - updated for 1.7.1 from FC, adjusted tw...
qboosh
qboosh at pld-linux.org
Sun May 28 00:07:30 CEST 2006
Author: qboosh Date: Sat May 27 22:07:30 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 1.7.1 from FC, adjusted two prototypes to kill warnings
---- Files affected:
SOURCES:
parted-aix.patch (1.2 -> 1.3)
---- Diffs:
================================================================
Index: SOURCES/parted-aix.patch
diff -u SOURCES/parted-aix.patch:1.2 SOURCES/parted-aix.patch:1.3
--- SOURCES/parted-aix.patch:1.2 Mon Jul 18 21:06:17 2005
+++ SOURCES/parted-aix.patch Sun May 28 00:07:25 2006
@@ -1,6 +1,69 @@
---- parted-1.6.3/libparted/disk_aix.c.aix 2003-05-28 02:37:39.000000000 -0400
-+++ parted-1.6.3/libparted/disk_aix.c 2003-05-28 02:54:28.000000000 -0400
-@@ -0,0 +1,283 @@
+--- parted-1.7.0/libparted/libparted.c.P151 2006-05-19 10:45:10.000000000 -0400
++++ parted-1.7.0/libparted/libparted.c 2006-05-19 11:45:51.000000000 -0400
+@@ -80,6 +80,7 @@
+ return 1;
+ }
+
++extern void ped_disk_aix_init ();
+ extern void ped_disk_bsd_init ();
+ extern void ped_disk_dvh_init ();
+ extern void ped_disk_gpt_init ();
+@@ -110,7 +111,7 @@
+ ped_disk_dvh_init ();
+ ped_disk_bsd_init ();
+ ped_disk_amiga_init ();
+-
++ ped_disk_aix_init ();
+ }
+
+ #ifdef ENABLE_FS
+@@ -141,6 +142,7 @@
+ }
+ #endif /* ENABLE_FS */
+
++extern void ped_disk_aix_done ();
+ extern void ped_disk_bsd_done ();
+ extern void ped_disk_dvh_done ();
+ extern void ped_disk_gpt_done ();
+@@ -169,6 +171,7 @@
+ ped_disk_dvh_done ();
+ ped_disk_bsd_done ();
+ ped_disk_amiga_done ();
++ ped_disk_aix_done ();
+ }
+
+ static void _init() __attribute__ ((constructor));
+--- parted-1.7.0/libparted/labels/Makefile.am.P151 2006-05-19 10:40:22.000000000 -0400
++++ parted-1.7.0/libparted/labels/Makefile.am 2006-05-19 11:42:26.000000000 -0400
+@@ -25,7 +25,8 @@
+ loop.c \
+ mac.c \
+ pc98.c \
+- sun.c
++ sun.c \
++ aix.c
+
+
+ liblabels_la_LIBADD = @OS_LIBS@
+--- parted-1.7.0/libparted/labels/dos.c.P151 2006-05-15 05:19:34.000000000 -0400
++++ parted-1.7.0/libparted/labels/dos.c 2006-05-19 11:44:40.000000000 -0400
+@@ -185,6 +185,13 @@
+ return 0;
+ }
+
++ /* If this is an AIX Physical Volume, fail here. IBMA in EBCDIC */
++ if (part_table.boot_code[0] == (char) 0xc9 &&
++ part_table.boot_code[1] == (char) 0xc2 &&
++ part_table.boot_code[2] == (char) 0xd4 &&
++ part_table.boot_code[3] == (char) 0xc1)
++ return 0;
++
+ #ifdef ENABLE_PC98
+ /* HACK: it's impossible to tell PC98 and msdos disk labels apart.
+ * Someone made the signatures the same (very clever). Since
+--- parted-1.7.0/libparted/labels/aix.c.P151 2006-05-19 11:43:15.000000000 -0400
++++ parted-1.7.0/libparted/labels/aix.c 2006-05-19 11:42:59.000000000 -0400
+@@ -0,0 +1,282 @@
+/* -*- Mode: c; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+
+ libparted - a library for manipulating disk partitions
@@ -48,7 +111,7 @@
+static PedDiskType aix_disk_type;
+
+static int
-+aix_probe (PedDevice *dev)
++aix_probe (const PedDevice *dev)
+{
+ PedDiskType* disk_type;
+ AixLabel label;
@@ -83,7 +146,7 @@
+#endif /* !DISCOVER_ONLY */
+
+static PedDisk*
-+aix_alloc (PedDevice* dev)
++aix_alloc (const PedDevice* dev)
+{
+ PedDisk* disk;
+
@@ -283,64 +346,3 @@
+{
+ ped_unregister_disk_type (&aix_disk_type);
+}
-+
---- parted-1.6.3/libparted/Makefile.am.aix 2003-05-28 02:37:56.000000000 -0400
-+++ parted-1.6.3/libparted/Makefile.am 2003-05-28 02:38:13.000000000 -0400
-@@ -47,6 +47,7 @@
- disk_pc98.c \
- disk_sun.c \
- disk_amiga.c \
-+ disk_aix.c \
- @OS at .c
-
- EXTRA_libparted_la_SOURCES = linux.c \
---- parted-1.6.3/libparted/disk_dos.c.aix 2003-05-28 01:34:04.000000000 -0400
-+++ parted-1.6.3/libparted/disk_dos.c 2003-05-28 01:59:53.000000000 -0400
-@@ -153,6 +153,13 @@
- return 0;
- }
-
-+ /* If this is an AIX Physical Volume, fail here. IBMA in EBCDIC */
-+ if (part_table.boot_code[0] == (char) 0xc9 &&
-+ part_table.boot_code[1] == (char) 0xc2 &&
-+ part_table.boot_code[2] == (char) 0xd4 &&
-+ part_table.boot_code[3] == (char) 0xc1)
-+ return 0;
-+
- #ifdef ENABLE_PC98
- /* HACK: it's impossible to tell PC98 and msdos disk labels apart.
- * Someone made the signatures the same (very clever). Since
---- parted-1.6.23/libparted/libparted.c.orig 2005-07-18 20:57:53.057531736 +0200
-+++ parted-1.6.23/libparted/libparted.c 2005-07-18 20:59:01.716094048 +0200
-@@ -78,6 +78,7 @@
- return 1;
- }
-
-+extern void ped_disk_aix_init ();
- extern void ped_disk_bsd_init ();
- extern void ped_disk_dvh_init ();
- extern void ped_disk_gpt_init ();
-@@ -108,6 +109,7 @@
- ped_disk_dvh_init ();
- ped_disk_bsd_init ();
- ped_disk_amiga_init ();
-+ ped_disk_aix_init ();
- }
-
- #ifdef ENABLE_FS
-@@ -138,6 +140,7 @@
- }
- #endif /* ENABLE_FS */
-
-+extern void ped_disk_aix_done ();
- extern void ped_disk_bsd_done ();
- extern void ped_disk_dvh_done ();
- extern void ped_disk_gpt_done ();
-@@ -166,6 +169,7 @@
- ped_disk_dvh_done ();
- ped_disk_bsd_done ();
- ped_disk_amiga_done ();
-+ ped_disk_aix_done ();
- }
-
- static void _init() __attribute__ ((constructor));
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/parted-aix.patch?r1=1.2&r2=1.3&f=u
More information about the pld-cvs-commit
mailing list