volume_id: define exported symbols

This commit is contained in:
Kay Sievers 2006-03-28 02:52:58 +02:00
parent d5618ac969
commit 92da64c700
6 changed files with 55 additions and 10 deletions

View File

@ -81,7 +81,9 @@ libvolume_id.a: $(HEADERS) $(OBJS)
$(SHLIB): $(HEADERS) .shlib $(addprefix .shlib/,$(OBJS))
$(E) " CC " $@
$(Q) $(CC) -shared $(CFLAGS) -o $@ -Wl,-soname,libvolume_id.so.$(SHLIB_CUR) $(addprefix .shlib/,$(OBJS))
$(Q) $(CC) -shared $(CFLAGS) -o $@ \
-Wl,-soname,libvolume_id.so.$(SHLIB_CUR),--version-script,exported_symbols \
$(addprefix .shlib/,$(OBJS))
$(Q) ln -sf $@ libvolume_id.so.$(SHLIB_CUR)
$(Q) ln -sf $@ libvolume_id.so

View File

@ -0,0 +1,43 @@
{ global:
volume_id_log_fn;
volume_id_open_fd;
volume_id_open_node;
volume_id_probe_all;
volume_id_probe_filesystem;
volume_id_probe_raid;
volume_id_close;
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_linux_raid;
volume_id_probe_lvm1;
volume_id_probe_lvm2;
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;
local:
*;
};

View File

@ -19,10 +19,10 @@
#endif
typedef void (*volume_id_log_fn)(int priority, const char *file, int line, const char *format, ...)
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 volume_id_log;
extern volume_id_log_fn_t volume_id_log_fn;
#define VOLUME_ID_LABEL_SIZE 64
#define VOLUME_ID_UUID_SIZE 36

View File

@ -23,10 +23,10 @@
#include <byteswap.h>
#include <syslog.h>
#define err(format, arg...) volume_id_log(LOG_ERR, __FILE__, __LINE__, format, ##arg)
#define info(format, arg...) volume_id_log(LOG_INFO, __FILE__, __LINE__, format, ##arg)
#define err(format, arg...) volume_id_log_fn(LOG_ERR, __FILE__, __LINE__, format, ##arg)
#define info(format, arg...) volume_id_log_fn(LOG_INFO, __FILE__, __LINE__, format, ##arg)
#ifdef DEBUG
#define dbg(format, arg...) volume_id_log(LOG_DEBUG, __FILE__, __LINE__, format, ##arg)
#define dbg(format, arg...) volume_id_log_fn(LOG_DEBUG, __FILE__, __LINE__, format, ##arg)
#else
#define dbg(format, arg...) do { } while (0)
#endif

View File

@ -35,7 +35,7 @@ static void default_log(int priority, const char *file, int line, const char *fo
return;
}
volume_id_log_fn volume_id_log = default_log;
volume_id_log_fn_t volume_id_log_fn = default_log;
int volume_id_probe_raid(struct volume_id *id, uint64_t off, uint64_t size)
{

View File

@ -1,7 +1,7 @@
/*
* vol_id - udev callout to read filesystem label and uuid
* vol_id - read filesystem label and uuid
*
* Copyright (C) 2005 Kay Sievers <kay.sievers@vrfy.org>
* Copyright (C) 2005-2006 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
@ -130,7 +130,7 @@ int main(int argc, char *argv[])
logging_init("vol_id");
/* hook in our debug into libvolume_id */
volume_id_log = vid_log;
volume_id_log_fn = vid_log;
for (i = 1 ; i < argc; i++) {
char *arg = argv[i];