mirror of
https://github.com/systemd/systemd-stable.git
synced 2024-10-30 23:21:08 +03:00
volume_id: remove deprecated functions and bump major version
This commit is contained in:
parent
ba6929f669
commit
2603474ff9
@ -18,8 +18,8 @@ AC_SUBST(LIBUDEV_LT_REVISION)
|
||||
AC_SUBST(LIBUDEV_LT_AGE)
|
||||
|
||||
dnl /* libvolume_id version */
|
||||
VOLID_LT_CURRENT=0
|
||||
VOLID_LT_REVISION=86
|
||||
VOLID_LT_CURRENT=1
|
||||
VOLID_LT_REVISION=0
|
||||
VOLID_LT_AGE=0
|
||||
AC_SUBST(VOLID_LT_CURRENT)
|
||||
AC_SUBST(VOLID_LT_REVISION)
|
||||
|
@ -6,6 +6,7 @@ include_HEADERS =\
|
||||
libvolume_id.h
|
||||
|
||||
libvolume_id_la_SOURCES =\
|
||||
libvolume_id-private.h \
|
||||
ext.c \
|
||||
fat.c \
|
||||
hfs.c \
|
||||
|
@ -24,6 +24,7 @@
|
||||
#include <ctype.h>
|
||||
|
||||
#include "libvolume_id.h"
|
||||
#include "libvolume_id-private.h"
|
||||
#include "util.h"
|
||||
|
||||
struct adaptec_meta {
|
||||
|
@ -24,6 +24,7 @@
|
||||
#include <ctype.h>
|
||||
|
||||
#include "libvolume_id.h"
|
||||
#include "libvolume_id-private.h"
|
||||
#include "util.h"
|
||||
|
||||
struct cramfs_super {
|
||||
|
@ -25,6 +25,7 @@
|
||||
#include <byteswap.h>
|
||||
|
||||
#include "libvolume_id.h"
|
||||
#include "libvolume_id-private.h"
|
||||
#include "util.h"
|
||||
|
||||
/* http://www.snia.org/standards/home */
|
||||
|
@ -14,42 +14,3 @@ volume_id_probe_raid
|
||||
volume_id_all_probers
|
||||
volume_id_get_prober_by_type
|
||||
volume_id_encode_string
|
||||
volume_id_open_node
|
||||
volume_id_probe_linux_swap
|
||||
volume_id_probe_luks
|
||||
volume_id_probe_cramfs
|
||||
volume_id_probe_ext
|
||||
volume_id_probe_vfat
|
||||
volume_id_probe_hfs_hfsplus
|
||||
volume_id_probe_hpfs
|
||||
volume_id_probe_iso9660
|
||||
volume_id_probe_jfs
|
||||
volume_id_probe_minix
|
||||
volume_id_probe_ntfs
|
||||
volume_id_probe_ocfs1
|
||||
volume_id_probe_ocfs2
|
||||
volume_id_probe_reiserfs
|
||||
volume_id_probe_romfs
|
||||
volume_id_probe_sysv
|
||||
volume_id_probe_udf
|
||||
volume_id_probe_ufs
|
||||
volume_id_probe_vxfs
|
||||
volume_id_probe_xfs
|
||||
volume_id_probe_squashfs
|
||||
volume_id_probe_netware
|
||||
volume_id_probe_gfs
|
||||
volume_id_probe_gfs2
|
||||
volume_id_probe_linux_raid
|
||||
volume_id_probe_lvm1
|
||||
volume_id_probe_lvm2
|
||||
volume_id_probe_ddf_raid
|
||||
volume_id_probe_intel_software_raid
|
||||
volume_id_probe_highpoint_37x_raid
|
||||
volume_id_probe_highpoint_45x_raid
|
||||
volume_id_probe_lsi_mega_raid
|
||||
volume_id_probe_nvidia_raid
|
||||
volume_id_probe_promise_fasttrack_raid
|
||||
volume_id_probe_silicon_medley_raid
|
||||
volume_id_probe_via_raid
|
||||
volume_id_probe_adaptec_raid
|
||||
volume_id_probe_jmicron_raid
|
||||
|
@ -27,6 +27,7 @@
|
||||
#include <ctype.h>
|
||||
|
||||
#include "libvolume_id.h"
|
||||
#include "libvolume_id-private.h"
|
||||
#include "util.h"
|
||||
|
||||
struct ext2_super_block {
|
||||
|
@ -25,6 +25,7 @@
|
||||
#include <ctype.h>
|
||||
|
||||
#include "libvolume_id.h"
|
||||
#include "libvolume_id-private.h"
|
||||
#include "util.h"
|
||||
|
||||
#define FAT12_MAX 0xff5
|
||||
|
@ -24,6 +24,7 @@
|
||||
#include <ctype.h>
|
||||
|
||||
#include "libvolume_id.h"
|
||||
#include "libvolume_id-private.h"
|
||||
#include "util.h"
|
||||
|
||||
/* Common gfs/gfs2 constants: */
|
||||
|
@ -24,6 +24,7 @@
|
||||
#include <ctype.h>
|
||||
|
||||
#include "libvolume_id.h"
|
||||
#include "libvolume_id-private.h"
|
||||
#include "util.h"
|
||||
|
||||
struct hfs_finder_info{
|
||||
|
@ -24,6 +24,7 @@
|
||||
#include <ctype.h>
|
||||
|
||||
#include "libvolume_id.h"
|
||||
#include "libvolume_id-private.h"
|
||||
#include "util.h"
|
||||
|
||||
struct hpt37x_meta {
|
||||
|
@ -24,6 +24,7 @@
|
||||
#include <ctype.h>
|
||||
|
||||
#include "libvolume_id.h"
|
||||
#include "libvolume_id-private.h"
|
||||
#include "util.h"
|
||||
|
||||
struct hpfs_super
|
||||
|
@ -24,6 +24,7 @@
|
||||
#include <ctype.h>
|
||||
|
||||
#include "libvolume_id.h"
|
||||
#include "libvolume_id-private.h"
|
||||
#include "util.h"
|
||||
|
||||
#define ISO_SUPERBLOCK_OFFSET 0x8000
|
||||
|
@ -24,6 +24,7 @@
|
||||
#include <ctype.h>
|
||||
|
||||
#include "libvolume_id.h"
|
||||
#include "libvolume_id-private.h"
|
||||
#include "util.h"
|
||||
|
||||
struct isw_meta {
|
||||
|
@ -24,6 +24,7 @@
|
||||
#include <ctype.h>
|
||||
|
||||
#include "libvolume_id.h"
|
||||
#include "libvolume_id-private.h"
|
||||
#include "util.h"
|
||||
|
||||
struct jfs_super_block {
|
||||
|
@ -24,6 +24,7 @@
|
||||
#include <ctype.h>
|
||||
|
||||
#include "libvolume_id.h"
|
||||
#include "libvolume_id-private.h"
|
||||
#include "util.h"
|
||||
|
||||
struct jmicron_meta {
|
||||
|
103
extras/volume_id/lib/libvolume_id-private.h
Normal file
103
extras/volume_id/lib/libvolume_id-private.h
Normal file
@ -0,0 +1,103 @@
|
||||
/*
|
||||
* volume_id - reads volume label and uuid
|
||||
*
|
||||
* Copyright (C) 2005-2007 Kay Sievers <kay.sievers@vrfy.org>
|
||||
*
|
||||
* 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 version 2 of the License.
|
||||
*/
|
||||
|
||||
#ifndef _LIBVOLUME_ID_PRIVATE_H_
|
||||
#define _LIBVOLUME_ID_PRIVATE_H_
|
||||
|
||||
#include <stdint.h>
|
||||
#include <stddef.h>
|
||||
|
||||
#include "libvolume_id.h"
|
||||
|
||||
#define VOLUME_ID_LABEL_SIZE 64
|
||||
#define VOLUME_ID_UUID_SIZE 36
|
||||
#define VOLUME_ID_FORMAT_SIZE 32
|
||||
#define VOLUME_ID_PATH_MAX 256
|
||||
#define VOLUME_ID_PARTITIONS_MAX 256
|
||||
|
||||
enum volume_id_usage {
|
||||
VOLUME_ID_UNUSED,
|
||||
VOLUME_ID_UNPROBED,
|
||||
VOLUME_ID_OTHER,
|
||||
VOLUME_ID_FILESYSTEM,
|
||||
VOLUME_ID_RAID,
|
||||
VOLUME_ID_DISKLABEL,
|
||||
VOLUME_ID_CRYPTO,
|
||||
};
|
||||
|
||||
struct volume_id {
|
||||
uint8_t label_raw[VOLUME_ID_LABEL_SIZE];
|
||||
size_t label_raw_len;
|
||||
char label[VOLUME_ID_LABEL_SIZE+1];
|
||||
uint8_t uuid_raw[VOLUME_ID_UUID_SIZE];
|
||||
size_t uuid_raw_len;
|
||||
char uuid[VOLUME_ID_UUID_SIZE+1];
|
||||
enum volume_id_usage usage_id;
|
||||
char *usage;
|
||||
char *type;
|
||||
char type_version[VOLUME_ID_FORMAT_SIZE];
|
||||
|
||||
int fd;
|
||||
uint8_t *sbbuf;
|
||||
size_t sbbuf_len;
|
||||
uint8_t *seekbuf;
|
||||
uint64_t seekbuf_off;
|
||||
size_t seekbuf_len;
|
||||
int fd_close:1;
|
||||
};
|
||||
|
||||
/* filesystems */
|
||||
extern int volume_id_probe_cramfs(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_ext(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_vfat(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_hfs_hfsplus(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_hpfs(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_iso9660(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_jfs(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_minix(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_ntfs(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_ocfs1(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_ocfs2(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_reiserfs(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_romfs(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_sysv(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_udf(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_ufs(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_vxfs(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_xfs(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_squashfs(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_netware(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_gfs(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_gfs2(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
|
||||
/* special formats */
|
||||
extern int volume_id_probe_linux_swap(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_luks(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
|
||||
/* raid */
|
||||
extern int volume_id_probe_linux_raid(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_lvm1(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_lvm2(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_ddf_raid(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_oracleasm(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
|
||||
/* bios raid */
|
||||
extern int volume_id_probe_intel_software_raid(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_highpoint_37x_raid(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_highpoint_45x_raid(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_lsi_mega_raid(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_nvidia_raid(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_promise_fasttrack_raid(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_silicon_medley_raid(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_via_raid(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_adaptec_raid(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_jmicron_raid(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
|
||||
#endif
|
@ -1,7 +1,7 @@
|
||||
/*
|
||||
* volume_id - reads volume label and uuid
|
||||
*
|
||||
* Copyright (C) 2005-2007 Kay Sievers <kay.sievers@vrfy.org>
|
||||
* Copyright (C) 2005-2008 Kay Sievers <kay.sievers@vrfy.org>
|
||||
*
|
||||
* 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
|
||||
@ -14,11 +14,11 @@
|
||||
#include <stdint.h>
|
||||
#include <stddef.h>
|
||||
|
||||
struct volume_id;
|
||||
typedef void (*volume_id_log_fn_t)(int priority, const char *file, int line, const char *format, ...)
|
||||
__attribute__ ((format(printf, 4, 5)));
|
||||
extern volume_id_log_fn_t volume_id_log_fn;
|
||||
|
||||
struct volume_id;
|
||||
typedef int (*volume_id_probe_fn_t)(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
typedef int (*all_probers_fn_t)(volume_id_probe_fn_t probe_fn,
|
||||
struct volume_id *id, uint64_t off, uint64_t size,
|
||||
@ -42,95 +42,4 @@ extern int volume_id_get_type(struct volume_id *id, const char **type);
|
||||
extern int volume_id_get_type_version(struct volume_id *id, const char **type_version);
|
||||
extern int volume_id_encode_string(const char *str, char *str_enc, size_t len);
|
||||
|
||||
/*
|
||||
* Note: everything below will be made private or removed from
|
||||
* a future version, and a new major release of libvolume_id
|
||||
*/
|
||||
|
||||
extern struct volume_id *volume_id_open_node(const char *path);
|
||||
|
||||
#define VOLUME_ID_LABEL_SIZE 64
|
||||
#define VOLUME_ID_UUID_SIZE 36
|
||||
#define VOLUME_ID_FORMAT_SIZE 32
|
||||
#define VOLUME_ID_PATH_MAX 256
|
||||
#define VOLUME_ID_PARTITIONS_MAX 256
|
||||
|
||||
enum volume_id_usage {
|
||||
VOLUME_ID_UNUSED,
|
||||
VOLUME_ID_UNPROBED,
|
||||
VOLUME_ID_OTHER,
|
||||
VOLUME_ID_FILESYSTEM,
|
||||
VOLUME_ID_RAID,
|
||||
VOLUME_ID_DISKLABEL,
|
||||
VOLUME_ID_CRYPTO,
|
||||
};
|
||||
|
||||
struct volume_id {
|
||||
uint8_t label_raw[VOLUME_ID_LABEL_SIZE];
|
||||
size_t label_raw_len;
|
||||
char label[VOLUME_ID_LABEL_SIZE+1];
|
||||
uint8_t uuid_raw[VOLUME_ID_UUID_SIZE];
|
||||
size_t uuid_raw_len;
|
||||
char uuid[VOLUME_ID_UUID_SIZE+1];
|
||||
enum volume_id_usage usage_id;
|
||||
char *usage;
|
||||
char *type;
|
||||
char type_version[VOLUME_ID_FORMAT_SIZE];
|
||||
|
||||
int fd;
|
||||
uint8_t *sbbuf;
|
||||
size_t sbbuf_len;
|
||||
uint8_t *seekbuf;
|
||||
uint64_t seekbuf_off;
|
||||
size_t seekbuf_len;
|
||||
int fd_close:1;
|
||||
};
|
||||
|
||||
/* filesystems */
|
||||
extern int volume_id_probe_cramfs(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_ext(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_vfat(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_hfs_hfsplus(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_hpfs(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_iso9660(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_jfs(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_minix(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_ntfs(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_ocfs1(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_ocfs2(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_reiserfs(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_romfs(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_sysv(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_udf(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_ufs(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_vxfs(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_xfs(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_squashfs(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_netware(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_gfs(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_gfs2(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
|
||||
/* special formats */
|
||||
extern int volume_id_probe_linux_swap(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_luks(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
|
||||
/* raid */
|
||||
extern int volume_id_probe_linux_raid(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_lvm1(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_lvm2(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_ddf_raid(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_oracleasm(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
|
||||
/* bios raid */
|
||||
extern int volume_id_probe_intel_software_raid(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_highpoint_37x_raid(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_highpoint_45x_raid(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_lsi_mega_raid(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_nvidia_raid(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_promise_fasttrack_raid(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_silicon_medley_raid(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_via_raid(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_adaptec_raid(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
extern int volume_id_probe_jmicron_raid(struct volume_id *id, uint64_t off, uint64_t size);
|
||||
|
||||
#endif
|
||||
|
@ -25,6 +25,7 @@
|
||||
#include <byteswap.h>
|
||||
|
||||
#include "libvolume_id.h"
|
||||
#include "libvolume_id-private.h"
|
||||
#include "util.h"
|
||||
|
||||
struct mdp0_super_block {
|
||||
|
@ -24,6 +24,7 @@
|
||||
#include <ctype.h>
|
||||
|
||||
#include "libvolume_id.h"
|
||||
#include "libvolume_id-private.h"
|
||||
#include "util.h"
|
||||
|
||||
struct swap_header_v1_2 {
|
||||
|
@ -24,6 +24,7 @@
|
||||
#include <ctype.h>
|
||||
|
||||
#include "libvolume_id.h"
|
||||
#include "libvolume_id-private.h"
|
||||
#include "util.h"
|
||||
|
||||
struct lsi_meta {
|
||||
|
@ -24,6 +24,7 @@
|
||||
#include <ctype.h>
|
||||
|
||||
#include "libvolume_id.h"
|
||||
#include "libvolume_id-private.h"
|
||||
#include "util.h"
|
||||
|
||||
#define SECTOR_SHIFT 9
|
||||
|
@ -24,6 +24,7 @@
|
||||
#include <ctype.h>
|
||||
|
||||
#include "libvolume_id.h"
|
||||
#include "libvolume_id-private.h"
|
||||
#include "util.h"
|
||||
|
||||
struct lvm1_super_block {
|
||||
|
@ -24,6 +24,7 @@
|
||||
#include <ctype.h>
|
||||
|
||||
#include "libvolume_id.h"
|
||||
#include "libvolume_id-private.h"
|
||||
#include "util.h"
|
||||
|
||||
#define MINIX_SUPERBLOCK_OFFSET 0x400
|
||||
|
@ -24,6 +24,7 @@
|
||||
#include <ctype.h>
|
||||
|
||||
#include "libvolume_id.h"
|
||||
#include "libvolume_id-private.h"
|
||||
#include "util.h"
|
||||
|
||||
#define NW_SUPERBLOCK_OFFSET 0x1000
|
||||
|
@ -24,6 +24,7 @@
|
||||
#include <ctype.h>
|
||||
|
||||
#include "libvolume_id.h"
|
||||
#include "libvolume_id-private.h"
|
||||
#include "util.h"
|
||||
|
||||
static struct ntfs_super_block {
|
||||
|
@ -24,6 +24,7 @@
|
||||
#include <ctype.h>
|
||||
|
||||
#include "libvolume_id.h"
|
||||
#include "libvolume_id-private.h"
|
||||
#include "util.h"
|
||||
|
||||
struct nvidia_meta {
|
||||
|
@ -25,6 +25,7 @@
|
||||
#include <ctype.h>
|
||||
|
||||
#include "libvolume_id.h"
|
||||
#include "libvolume_id-private.h"
|
||||
#include "util.h"
|
||||
|
||||
|
||||
|
@ -24,6 +24,7 @@
|
||||
#include <ctype.h>
|
||||
|
||||
#include "libvolume_id.h"
|
||||
#include "libvolume_id-private.h"
|
||||
#include "util.h"
|
||||
|
||||
struct oracleasm_super_block {
|
||||
|
@ -24,6 +24,7 @@
|
||||
#include <ctype.h>
|
||||
|
||||
#include "libvolume_id.h"
|
||||
#include "libvolume_id-private.h"
|
||||
#include "util.h"
|
||||
|
||||
struct promise_meta {
|
||||
|
@ -25,6 +25,7 @@
|
||||
#include <ctype.h>
|
||||
|
||||
#include "libvolume_id.h"
|
||||
#include "libvolume_id-private.h"
|
||||
#include "util.h"
|
||||
|
||||
struct reiserfs_super_block {
|
||||
|
@ -24,6 +24,7 @@
|
||||
#include <ctype.h>
|
||||
|
||||
#include "libvolume_id.h"
|
||||
#include "libvolume_id-private.h"
|
||||
#include "util.h"
|
||||
|
||||
struct romfs_super {
|
||||
|
@ -24,6 +24,7 @@
|
||||
#include <ctype.h>
|
||||
|
||||
#include "libvolume_id.h"
|
||||
#include "libvolume_id-private.h"
|
||||
#include "util.h"
|
||||
|
||||
struct silicon_meta {
|
||||
|
@ -24,6 +24,7 @@
|
||||
#include <ctype.h>
|
||||
|
||||
#include "libvolume_id.h"
|
||||
#include "libvolume_id-private.h"
|
||||
#include "util.h"
|
||||
|
||||
#define SQUASHFS_MAGIC 0x73717368
|
||||
|
@ -24,6 +24,7 @@
|
||||
#include <ctype.h>
|
||||
|
||||
#include "libvolume_id.h"
|
||||
#include "libvolume_id-private.h"
|
||||
#include "util.h"
|
||||
|
||||
#define SYSV_NICINOD 100
|
||||
|
@ -24,6 +24,7 @@
|
||||
#include <ctype.h>
|
||||
|
||||
#include "libvolume_id.h"
|
||||
#include "libvolume_id-private.h"
|
||||
#include "util.h"
|
||||
|
||||
struct volume_descriptor {
|
||||
|
@ -24,6 +24,7 @@
|
||||
#include <ctype.h>
|
||||
|
||||
#include "libvolume_id.h"
|
||||
#include "libvolume_id-private.h"
|
||||
#include "util.h"
|
||||
|
||||
struct ufs_super_block {
|
||||
|
@ -26,6 +26,7 @@
|
||||
#include <sys/stat.h>
|
||||
|
||||
#include "libvolume_id.h"
|
||||
#include "libvolume_id-private.h"
|
||||
#include "util.h"
|
||||
|
||||
/* count of characters used to encode one unicode char */
|
||||
|
@ -27,6 +27,7 @@
|
||||
#include <ctype.h>
|
||||
|
||||
#include "libvolume_id.h"
|
||||
#include "libvolume_id-private.h"
|
||||
#include "util.h"
|
||||
|
||||
struct via_meta {
|
||||
|
@ -26,6 +26,7 @@
|
||||
#include <sys/stat.h>
|
||||
|
||||
#include "libvolume_id.h"
|
||||
#include "libvolume_id-private.h"
|
||||
#include "util.h"
|
||||
|
||||
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
|
||||
@ -489,27 +490,6 @@ struct volume_id *volume_id_open_fd(int fd)
|
||||
return id;
|
||||
}
|
||||
|
||||
struct volume_id *volume_id_open_node(const char *path)
|
||||
{
|
||||
struct volume_id *id;
|
||||
int fd;
|
||||
|
||||
fd = open(path, O_RDONLY);
|
||||
if (fd < 0) {
|
||||
dbg("unable to open '%s'\n", path);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
id = volume_id_open_fd(fd);
|
||||
if (id == NULL)
|
||||
return NULL;
|
||||
|
||||
/* close fd on device close */
|
||||
id->fd_close = 1;
|
||||
|
||||
return id;
|
||||
}
|
||||
|
||||
/**
|
||||
* volume_id_close:
|
||||
* @id: Probing context.
|
||||
|
@ -24,6 +24,7 @@
|
||||
#include <ctype.h>
|
||||
|
||||
#include "libvolume_id.h"
|
||||
#include "libvolume_id-private.h"
|
||||
#include "util.h"
|
||||
|
||||
#define VXFS_SUPER_MAGIC 0xa501FCF5
|
||||
|
@ -24,6 +24,7 @@
|
||||
#include <ctype.h>
|
||||
|
||||
#include "libvolume_id.h"
|
||||
#include "libvolume_id-private.h"
|
||||
#include "util.h"
|
||||
|
||||
struct xfs_super_block {
|
||||
|
Loading…
Reference in New Issue
Block a user