move architecture specific code since they're used in a single place

All architecture headers (linux.h, gnu.h and beos.h) are now
removed. The required code has beem moved to the C file that required
it.

diff --git a/include/parted/Makefile.am b/include/parted/Makefile.am
index dd0e1d4..a1ba960 100644 (file)
--- a/include/parted/Makefile.am
+++ b/include/parted/Makefile.am
@@ -6,9 +6,7 @@ endif
 
 partedincludedir      =        $(includedir)/parted
 
-partedinclude_HEADERS = gnu.h          \
-                       linux.h         \
-                       constraint.h    \
+partedinclude_HEADERS = constraint.h   \
                        debug.h         \
                        device.h        \
                        disk.h          \

diff --git a/include/parted/beos.h b/include/parted/beos.h
deleted file mode 100644 (file)
index b4d692c..0000000
--- a/include/parted/beos.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-    libparted - a library for manipulating disk partitions
-    Copyright (C) 2006, 2007 Free Software Foundation, Inc.
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PED_BEOS_H_INCLUDED
-#define PED_BEOS_H_INCLUDED
-
-#include <parted/parted.h>
-#include <parted/device.h>
-
-#define BEOS_SPECIFIC(dev)     ((BEOSSpecific*) (dev)->arch_specific)
-
-typedef        struct _BEOSSpecific    BEOSSpecific;
-
-struct _BEOSSpecific {
-       int     fd;
-};
-
-#endif /* PED_LINUX_H_INCLUDED */
-

diff --git a/include/parted/gnu.h b/include/parted/gnu.h
deleted file mode 100644 (file)
index a47b026..0000000
--- a/include/parted/gnu.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-    libparted - a library for manipulating disk partitions
-    Copyright (C) 2001, 2007 Free Software Foundation, Inc.
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PED_GNU_H_INCLUDED
-#define PED_GNU_H_INCLUDED
-
-#include <parted/parted.h>
-
-#include <hurd/store.h>
-
-#define GNU_SPECIFIC(dev)      ((GNUSpecific*) (dev)->arch_specific)
-
-typedef        struct _GNUSpecific     GNUSpecific;
-
-struct _GNUSpecific {
-       struct store*   store;
-       int consume;
-};
-
-/* Initialize a PedDevice using SOURCE.  The SOURCE will NOT be destroyed;
-   the caller created it, it is the caller's responsilbility to free it
-   after it calls ped_device_destory.  SOURCE is not registered in Parted's
-   list of devices.  */
-PedDevice* ped_device_new_from_store (struct store *source);
-
-#endif /* PED_GNU_H_INCLUDED */
-

diff --git a/include/parted/linux.h b/include/parted/linux.h
deleted file mode 100644 (file)
index 1a4171d..0000000
--- a/include/parted/linux.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-    libparted - a library for manipulating disk partitions
-    Copyright (C) 2001, 2007 Free Software Foundation, Inc.
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PED_LINUX_H_INCLUDED
-#define PED_LINUX_H_INCLUDED
-
-#include <parted/parted.h>
-#include <parted/device.h>
-
-#if defined(__s390__) || defined(__s390x__)
-#  include <parted/fdasd.h>
-#endif
-
-#define LINUX_SPECIFIC(dev)    ((LinuxSpecific*) (dev)->arch_specific)
-
-typedef        struct _LinuxSpecific   LinuxSpecific;
-
-struct _LinuxSpecific {
-       int     fd;
-       char*   dmtype;         /**< device map target type */
-#if defined(__s390__) || defined(__s390x__)
-       unsigned int real_sector_size;
-       /* IBM internal dasd structure (i guess ;), required. */
-       struct fdasd_anchor *anchor;
-#endif
-};
-
-#endif /* PED_LINUX_H_INCLUDED */
-

diff --git a/libparted/arch/beos.c b/libparted/arch/beos.c
index 96b5058..1d0cf64 100644 (file)
--- a/libparted/arch/beos.c
+++ b/libparted/arch/beos.c
@@ -20,7 +20,6 @@
 
 #include <parted/parted.h>
 #include <parted/debug.h>
-#include <parted/beos.h>
 
 /* POSIX headers */
 #include <sys/stat.h>
@@ -47,6 +46,14 @@
 
 #include "../architecture.h"
 
+#define BEOS_SPECIFIC(dev)     ((BEOSSpecific*) (dev)->arch_specific)
+
+typedef        struct _BEOSSpecific    BEOSSpecific;
+
+struct _BEOSSpecific {
+       int     fd;
+};
+
 static void
 _scan_for_disks(const char* path)
 {

diff --git a/libparted/arch/gnu.c b/libparted/arch/gnu.c
index 6c619e4..0f08b9b 100644 (file)
--- a/libparted/arch/gnu.c
+++ b/libparted/arch/gnu.c
@@ -20,7 +20,6 @@
 
 #include <parted/parted.h>
 #include <parted/debug.h>
-#include <parted/gnu.h>
 
 #include <errno.h>
 #include <hurd.h>
@@ -39,6 +38,21 @@
 
 #include "../architecture.h"
 
+#define GNU_SPECIFIC(dev)      ((GNUSpecific*) (dev)->arch_specific)
+
+typedef        struct _GNUSpecific     GNUSpecific;
+
+struct _GNUSpecific {
+       struct store*   store;
+       int consume;
+};
+
+/* Initialize a PedDevice using SOURCE.  The SOURCE will NOT be destroyed;
+   the caller created it, it is the caller's responsilbility to free it
+   after it calls ped_device_destory.  SOURCE is not registered in Parted's
+   list of devices.  */
+PedDevice* ped_device_new_from_store (struct store *source);
+
 static int
 _device_get_sector_size (PedDevice* dev)
 {

diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c
index 3527f5d..da812d5 100644 (file)
--- a/libparted/arch/linux.c
+++ b/libparted/arch/linux.c
@@ -21,7 +21,6 @@
 
 #include <parted/parted.h>
 #include <parted/debug.h>
-#include <parted/linux.h>
 
 #include <ctype.h>
 #include <errno.h>
@@ -75,6 +74,24 @@
 #define RW_MODE (O_RDWR)
 #endif
 
+#if defined(__s390__) || defined(__s390x__)
+#  include <parted/fdasd.h>
+#endif
+
+#define LINUX_SPECIFIC(dev)    ((LinuxSpecific*) (dev)->arch_specific)
+
+typedef        struct _LinuxSpecific   LinuxSpecific;
+
+struct _LinuxSpecific {
+       int     fd;
+       char*   dmtype;         /**< device map target type */
+#if defined(__s390__) || defined(__s390x__)
+       unsigned int real_sector_size;
+       /* IBM internal dasd structure (i guess ;), required. */
+       struct fdasd_anchor *anchor;
+#endif
+};
+
 struct hd_geometry {
         unsigned char heads;
         unsigned char sectors;