From 219227c263ac15de91633f81ab6a536f5c8aa57e Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Wed, 22 Jul 2009 23:21:27 +0200 Subject: [PATCH] libblkid: move FS/raid stuff to superblocks directory Signed-off-by: Karel Zak --- configure.ac | 2 +- shlibs/blkid/src/Makefile.am | 6 +++--- shlibs/blkid/src/probe.c | 3 ++- shlibs/blkid/src/{probers => superblocks}/Makefile.am | 6 +++--- shlibs/blkid/src/{probers => superblocks}/adaptec_raid.c | 0 shlibs/blkid/src/{probers => superblocks}/btrfs.c | 0 shlibs/blkid/src/{probers => superblocks}/cramfs.c | 0 shlibs/blkid/src/{probers => superblocks}/ddf_raid.c | 0 shlibs/blkid/src/{probers => superblocks}/ext.c | 0 shlibs/blkid/src/{probers => superblocks}/gfs.c | 0 shlibs/blkid/src/{probers => superblocks}/hfs.c | 0 shlibs/blkid/src/{probers => superblocks}/highpoint_raid.c | 0 shlibs/blkid/src/{probers => superblocks}/hpfs.c | 0 shlibs/blkid/src/{probers => superblocks}/iso9660.c | 0 shlibs/blkid/src/{probers => superblocks}/isw_raid.c | 0 shlibs/blkid/src/{probers => superblocks}/jfs.c | 0 shlibs/blkid/src/{probers => superblocks}/jmicron_raid.c | 0 shlibs/blkid/src/{probers => superblocks}/linux_raid.c | 0 shlibs/blkid/src/{probers => superblocks}/lsi_raid.c | 0 shlibs/blkid/src/{probers => superblocks}/luks.c | 0 shlibs/blkid/src/{probers => superblocks}/lvm.c | 0 shlibs/blkid/src/{probers => superblocks}/minix.c | 0 shlibs/blkid/src/{probers => superblocks}/netware.c | 0 shlibs/blkid/src/{probers => superblocks}/ntfs.c | 0 shlibs/blkid/src/{probers => superblocks}/nvidia_raid.c | 0 shlibs/blkid/src/{probers => superblocks}/ocfs.c | 0 shlibs/blkid/src/{probers => superblocks}/promise_raid.c | 0 shlibs/blkid/src/{probers => superblocks}/reiserfs.c | 0 shlibs/blkid/src/{probers => superblocks}/romfs.c | 0 shlibs/blkid/src/{probers => superblocks}/silicon_raid.c | 0 shlibs/blkid/src/{probers => superblocks}/squashfs.c | 0 .../src/{probers/probers.h => superblocks/superblocks.h} | 0 shlibs/blkid/src/{probers => superblocks}/swap.c | 0 shlibs/blkid/src/{probers => superblocks}/sysv.c | 0 shlibs/blkid/src/{probers => superblocks}/udf.c | 0 shlibs/blkid/src/{probers => superblocks}/ufs.c | 0 shlibs/blkid/src/{probers => superblocks}/vfat.c | 0 shlibs/blkid/src/{probers => superblocks}/via_raid.c | 0 shlibs/blkid/src/{probers => superblocks}/vxfs.c | 0 shlibs/blkid/src/{probers => superblocks}/xfs.c | 0 shlibs/blkid/src/{probers => superblocks}/zfs.c | 0 41 files changed, 9 insertions(+), 8 deletions(-) rename shlibs/blkid/src/{probers => superblocks}/Makefile.am (85%) rename shlibs/blkid/src/{probers => superblocks}/adaptec_raid.c (100%) rename shlibs/blkid/src/{probers => superblocks}/btrfs.c (100%) rename shlibs/blkid/src/{probers => superblocks}/cramfs.c (100%) rename shlibs/blkid/src/{probers => superblocks}/ddf_raid.c (100%) rename shlibs/blkid/src/{probers => superblocks}/ext.c (100%) rename shlibs/blkid/src/{probers => superblocks}/gfs.c (100%) rename shlibs/blkid/src/{probers => superblocks}/hfs.c (100%) rename shlibs/blkid/src/{probers => superblocks}/highpoint_raid.c (100%) rename shlibs/blkid/src/{probers => superblocks}/hpfs.c (100%) rename shlibs/blkid/src/{probers => superblocks}/iso9660.c (100%) rename shlibs/blkid/src/{probers => superblocks}/isw_raid.c (100%) rename shlibs/blkid/src/{probers => superblocks}/jfs.c (100%) rename shlibs/blkid/src/{probers => superblocks}/jmicron_raid.c (100%) rename shlibs/blkid/src/{probers => superblocks}/linux_raid.c (100%) rename shlibs/blkid/src/{probers => superblocks}/lsi_raid.c (100%) rename shlibs/blkid/src/{probers => superblocks}/luks.c (100%) rename shlibs/blkid/src/{probers => superblocks}/lvm.c (100%) rename shlibs/blkid/src/{probers => superblocks}/minix.c (100%) rename shlibs/blkid/src/{probers => superblocks}/netware.c (100%) rename shlibs/blkid/src/{probers => superblocks}/ntfs.c (100%) rename shlibs/blkid/src/{probers => superblocks}/nvidia_raid.c (100%) rename shlibs/blkid/src/{probers => superblocks}/ocfs.c (100%) rename shlibs/blkid/src/{probers => superblocks}/promise_raid.c (100%) rename shlibs/blkid/src/{probers => superblocks}/reiserfs.c (100%) rename shlibs/blkid/src/{probers => superblocks}/romfs.c (100%) rename shlibs/blkid/src/{probers => superblocks}/silicon_raid.c (100%) rename shlibs/blkid/src/{probers => superblocks}/squashfs.c (100%) rename shlibs/blkid/src/{probers/probers.h => superblocks/superblocks.h} (100%) rename shlibs/blkid/src/{probers => superblocks}/swap.c (100%) rename shlibs/blkid/src/{probers => superblocks}/sysv.c (100%) rename shlibs/blkid/src/{probers => superblocks}/udf.c (100%) rename shlibs/blkid/src/{probers => superblocks}/ufs.c (100%) rename shlibs/blkid/src/{probers => superblocks}/vfat.c (100%) rename shlibs/blkid/src/{probers => superblocks}/via_raid.c (100%) rename shlibs/blkid/src/{probers => superblocks}/vxfs.c (100%) rename shlibs/blkid/src/{probers => superblocks}/xfs.c (100%) rename shlibs/blkid/src/{probers => superblocks}/zfs.c (100%) diff --git a/configure.ac b/configure.ac index 7e13a61e..091d76b8 100644 --- a/configure.ac +++ b/configure.ac @@ -921,7 +921,7 @@ schedutils/Makefile shlibs/blkid/blkid.pc shlibs/blkid/Makefile shlibs/blkid/src/Makefile -shlibs/blkid/src/probers/Makefile +shlibs/blkid/src/superblocks/Makefile shlibs/uuid/uuid.pc shlibs/uuid/Makefile shlibs/uuid/man/Makefile diff --git a/shlibs/blkid/src/Makefile.am b/shlibs/blkid/src/Makefile.am index bd040ce9..10d1baa8 100644 --- a/shlibs/blkid/src/Makefile.am +++ b/shlibs/blkid/src/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/config/include-Makefile.am -SUBDIRS = probers . +SUBDIRS = superblocks . common_ldadd = common_cflags = @@ -24,7 +24,7 @@ blkidinc_HEADERS = blkid.h usrlib_exec_LTLIBRARIES = libblkid.la libblkid_la_SOURCES = cache.c dev.c devname.c devno.c getsize.c llseek.c \ probe.c read.c resolve.c save.c tag.c version.c verify.c \ - encode.c blkid.h list.h blkidP.h probers/probers.h \ + encode.c blkid.h list.h blkidP.h superblocks/superblocks.h \ config.c evaluate.c \ $(blkidinc_HEADERS) \ $(top_srcdir)/lib/blkdev.c \ @@ -32,7 +32,7 @@ libblkid_la_SOURCES = cache.c dev.c devname.c devno.c getsize.c llseek.c \ $(top_srcdir)/lib/canonicalize.c \ $(top_srcdir)/lib/md5.c -libblkid_la_LIBADD = probers/libblkid_probers.la $(common_ldadd) +libblkid_la_LIBADD = superblocks/libblkid_superblocks.la $(common_ldadd) libblkid_la_DEPENDENCIES = $(libblkid_la_LIBADD) blkid.sym libblkid_la_LDFLAGS = -Wl,--version-script=$(ul_libblkid_srcdir)/blkid.sym \ diff --git a/shlibs/blkid/src/probe.c b/shlibs/blkid/src/probe.c index 10fcb003..4677389e 100644 --- a/shlibs/blkid/src/probe.c +++ b/shlibs/blkid/src/probe.c @@ -36,7 +36,8 @@ #include "blkdev.h" #include "blkidP.h" -#include "probers/probers.h" + +#include "superblocks/superblocks.h" static const struct blkid_idinfo *idinfos[] = { diff --git a/shlibs/blkid/src/probers/Makefile.am b/shlibs/blkid/src/superblocks/Makefile.am similarity index 85% rename from shlibs/blkid/src/probers/Makefile.am rename to shlibs/blkid/src/superblocks/Makefile.am index 4591db6a..07508702 100644 --- a/shlibs/blkid/src/probers/Makefile.am +++ b/shlibs/blkid/src/superblocks/Makefile.am @@ -2,9 +2,9 @@ include $(top_srcdir)/config/include-Makefile.am AM_CPPFLAGS += -I$(ul_libblkid_srcdir) -noinst_LTLIBRARIES = libblkid_probers.la -libblkid_probers_la_SOURCES = \ - probers.h \ +noinst_LTLIBRARIES = libblkid_superblocks.la +libblkid_superblocks_la_SOURCES = \ + superblocks.h \ cramfs.c \ swap.c \ adaptec_raid.c \ diff --git a/shlibs/blkid/src/probers/adaptec_raid.c b/shlibs/blkid/src/superblocks/adaptec_raid.c similarity index 100% rename from shlibs/blkid/src/probers/adaptec_raid.c rename to shlibs/blkid/src/superblocks/adaptec_raid.c diff --git a/shlibs/blkid/src/probers/btrfs.c b/shlibs/blkid/src/superblocks/btrfs.c similarity index 100% rename from shlibs/blkid/src/probers/btrfs.c rename to shlibs/blkid/src/superblocks/btrfs.c diff --git a/shlibs/blkid/src/probers/cramfs.c b/shlibs/blkid/src/superblocks/cramfs.c similarity index 100% rename from shlibs/blkid/src/probers/cramfs.c rename to shlibs/blkid/src/superblocks/cramfs.c diff --git a/shlibs/blkid/src/probers/ddf_raid.c b/shlibs/blkid/src/superblocks/ddf_raid.c similarity index 100% rename from shlibs/blkid/src/probers/ddf_raid.c rename to shlibs/blkid/src/superblocks/ddf_raid.c diff --git a/shlibs/blkid/src/probers/ext.c b/shlibs/blkid/src/superblocks/ext.c similarity index 100% rename from shlibs/blkid/src/probers/ext.c rename to shlibs/blkid/src/superblocks/ext.c diff --git a/shlibs/blkid/src/probers/gfs.c b/shlibs/blkid/src/superblocks/gfs.c similarity index 100% rename from shlibs/blkid/src/probers/gfs.c rename to shlibs/blkid/src/superblocks/gfs.c diff --git a/shlibs/blkid/src/probers/hfs.c b/shlibs/blkid/src/superblocks/hfs.c similarity index 100% rename from shlibs/blkid/src/probers/hfs.c rename to shlibs/blkid/src/superblocks/hfs.c diff --git a/shlibs/blkid/src/probers/highpoint_raid.c b/shlibs/blkid/src/superblocks/highpoint_raid.c similarity index 100% rename from shlibs/blkid/src/probers/highpoint_raid.c rename to shlibs/blkid/src/superblocks/highpoint_raid.c diff --git a/shlibs/blkid/src/probers/hpfs.c b/shlibs/blkid/src/superblocks/hpfs.c similarity index 100% rename from shlibs/blkid/src/probers/hpfs.c rename to shlibs/blkid/src/superblocks/hpfs.c diff --git a/shlibs/blkid/src/probers/iso9660.c b/shlibs/blkid/src/superblocks/iso9660.c similarity index 100% rename from shlibs/blkid/src/probers/iso9660.c rename to shlibs/blkid/src/superblocks/iso9660.c diff --git a/shlibs/blkid/src/probers/isw_raid.c b/shlibs/blkid/src/superblocks/isw_raid.c similarity index 100% rename from shlibs/blkid/src/probers/isw_raid.c rename to shlibs/blkid/src/superblocks/isw_raid.c diff --git a/shlibs/blkid/src/probers/jfs.c b/shlibs/blkid/src/superblocks/jfs.c similarity index 100% rename from shlibs/blkid/src/probers/jfs.c rename to shlibs/blkid/src/superblocks/jfs.c diff --git a/shlibs/blkid/src/probers/jmicron_raid.c b/shlibs/blkid/src/superblocks/jmicron_raid.c similarity index 100% rename from shlibs/blkid/src/probers/jmicron_raid.c rename to shlibs/blkid/src/superblocks/jmicron_raid.c diff --git a/shlibs/blkid/src/probers/linux_raid.c b/shlibs/blkid/src/superblocks/linux_raid.c similarity index 100% rename from shlibs/blkid/src/probers/linux_raid.c rename to shlibs/blkid/src/superblocks/linux_raid.c diff --git a/shlibs/blkid/src/probers/lsi_raid.c b/shlibs/blkid/src/superblocks/lsi_raid.c similarity index 100% rename from shlibs/blkid/src/probers/lsi_raid.c rename to shlibs/blkid/src/superblocks/lsi_raid.c diff --git a/shlibs/blkid/src/probers/luks.c b/shlibs/blkid/src/superblocks/luks.c similarity index 100% rename from shlibs/blkid/src/probers/luks.c rename to shlibs/blkid/src/superblocks/luks.c diff --git a/shlibs/blkid/src/probers/lvm.c b/shlibs/blkid/src/superblocks/lvm.c similarity index 100% rename from shlibs/blkid/src/probers/lvm.c rename to shlibs/blkid/src/superblocks/lvm.c diff --git a/shlibs/blkid/src/probers/minix.c b/shlibs/blkid/src/superblocks/minix.c similarity index 100% rename from shlibs/blkid/src/probers/minix.c rename to shlibs/blkid/src/superblocks/minix.c diff --git a/shlibs/blkid/src/probers/netware.c b/shlibs/blkid/src/superblocks/netware.c similarity index 100% rename from shlibs/blkid/src/probers/netware.c rename to shlibs/blkid/src/superblocks/netware.c diff --git a/shlibs/blkid/src/probers/ntfs.c b/shlibs/blkid/src/superblocks/ntfs.c similarity index 100% rename from shlibs/blkid/src/probers/ntfs.c rename to shlibs/blkid/src/superblocks/ntfs.c diff --git a/shlibs/blkid/src/probers/nvidia_raid.c b/shlibs/blkid/src/superblocks/nvidia_raid.c similarity index 100% rename from shlibs/blkid/src/probers/nvidia_raid.c rename to shlibs/blkid/src/superblocks/nvidia_raid.c diff --git a/shlibs/blkid/src/probers/ocfs.c b/shlibs/blkid/src/superblocks/ocfs.c similarity index 100% rename from shlibs/blkid/src/probers/ocfs.c rename to shlibs/blkid/src/superblocks/ocfs.c diff --git a/shlibs/blkid/src/probers/promise_raid.c b/shlibs/blkid/src/superblocks/promise_raid.c similarity index 100% rename from shlibs/blkid/src/probers/promise_raid.c rename to shlibs/blkid/src/superblocks/promise_raid.c diff --git a/shlibs/blkid/src/probers/reiserfs.c b/shlibs/blkid/src/superblocks/reiserfs.c similarity index 100% rename from shlibs/blkid/src/probers/reiserfs.c rename to shlibs/blkid/src/superblocks/reiserfs.c diff --git a/shlibs/blkid/src/probers/romfs.c b/shlibs/blkid/src/superblocks/romfs.c similarity index 100% rename from shlibs/blkid/src/probers/romfs.c rename to shlibs/blkid/src/superblocks/romfs.c diff --git a/shlibs/blkid/src/probers/silicon_raid.c b/shlibs/blkid/src/superblocks/silicon_raid.c similarity index 100% rename from shlibs/blkid/src/probers/silicon_raid.c rename to shlibs/blkid/src/superblocks/silicon_raid.c diff --git a/shlibs/blkid/src/probers/squashfs.c b/shlibs/blkid/src/superblocks/squashfs.c similarity index 100% rename from shlibs/blkid/src/probers/squashfs.c rename to shlibs/blkid/src/superblocks/squashfs.c diff --git a/shlibs/blkid/src/probers/probers.h b/shlibs/blkid/src/superblocks/superblocks.h similarity index 100% rename from shlibs/blkid/src/probers/probers.h rename to shlibs/blkid/src/superblocks/superblocks.h diff --git a/shlibs/blkid/src/probers/swap.c b/shlibs/blkid/src/superblocks/swap.c similarity index 100% rename from shlibs/blkid/src/probers/swap.c rename to shlibs/blkid/src/superblocks/swap.c diff --git a/shlibs/blkid/src/probers/sysv.c b/shlibs/blkid/src/superblocks/sysv.c similarity index 100% rename from shlibs/blkid/src/probers/sysv.c rename to shlibs/blkid/src/superblocks/sysv.c diff --git a/shlibs/blkid/src/probers/udf.c b/shlibs/blkid/src/superblocks/udf.c similarity index 100% rename from shlibs/blkid/src/probers/udf.c rename to shlibs/blkid/src/superblocks/udf.c diff --git a/shlibs/blkid/src/probers/ufs.c b/shlibs/blkid/src/superblocks/ufs.c similarity index 100% rename from shlibs/blkid/src/probers/ufs.c rename to shlibs/blkid/src/superblocks/ufs.c diff --git a/shlibs/blkid/src/probers/vfat.c b/shlibs/blkid/src/superblocks/vfat.c similarity index 100% rename from shlibs/blkid/src/probers/vfat.c rename to shlibs/blkid/src/superblocks/vfat.c diff --git a/shlibs/blkid/src/probers/via_raid.c b/shlibs/blkid/src/superblocks/via_raid.c similarity index 100% rename from shlibs/blkid/src/probers/via_raid.c rename to shlibs/blkid/src/superblocks/via_raid.c diff --git a/shlibs/blkid/src/probers/vxfs.c b/shlibs/blkid/src/superblocks/vxfs.c similarity index 100% rename from shlibs/blkid/src/probers/vxfs.c rename to shlibs/blkid/src/superblocks/vxfs.c diff --git a/shlibs/blkid/src/probers/xfs.c b/shlibs/blkid/src/superblocks/xfs.c similarity index 100% rename from shlibs/blkid/src/probers/xfs.c rename to shlibs/blkid/src/superblocks/xfs.c diff --git a/shlibs/blkid/src/probers/zfs.c b/shlibs/blkid/src/superblocks/zfs.c similarity index 100% rename from shlibs/blkid/src/probers/zfs.c rename to shlibs/blkid/src/superblocks/zfs.c -- 2.39.5