Only functions listed in libdevmapper.h should get exported.

diff --git a/lib/.export.sym b/lib/.export.sym
new file mode 100644 (file)
index 0000000..44f18b7
--- /dev/null
+++ b/lib/.export.sym
@@ -0,0 +1,24 @@
+{ 
+       global:
+               dm_log_init;
+               dm_task_create;
+               dm_task_destroy;
+               dm_task_set_name;
+               dm_task_set_uuid;
+               dm_get_library_version;
+               dm_task_get_driver_version;
+               dm_task_get_info;
+               dm_task_get_deps;
+               dm_task_get_uuid;
+               dm_task_set_ro;
+               dm_task_set_newname;
+               dm_task_set_minor;
+               dm_task_add_target;
+               dm_get_next_target;
+               dm_task_run;
+               dm_set_dev_dir;
+               dm_dir;
+       local:
+               *;
+};
+

diff --git a/lib/libdm-common.c b/lib/libdm-common.c
index 430efb0bb17e595f97d4835bb828ebfbb4e6c6c9..6ed3f47769b2b58c90591d2e83fe06f6317d0d16 100644 (file)
--- a/lib/libdm-common.c
+++ b/lib/libdm-common.c
@@ -29,7 +29,8 @@ static char _dm_dir[PATH_MAX] = DEV_DIR DM_DIR;
  * Library users can provide their own logging
  * function.
  */
-void _default_log(int level, const char *file, int line, const char *f, ...)
+static void _default_log(int level, const char *file, int line,
+                        const char *f, ...)
 {
        va_list ap;
 
@@ -55,7 +56,7 @@ void dm_log_init(dm_log_fn fn)
        _log = fn;
 }
 
-void _build_dev_path(char *buffer, size_t len, const char *dev_name)
+static void _build_dev_path(char *buffer, size_t len, const char *dev_name)
 {
        /* If there's a /, assume caller knows what they're doing */
        if (strchr(dev_name, '/'))

diff --git a/lib/libdm-common.h.in b/lib/libdm-common.h.in
index 5427e7aa991a7f1db822ecb5b92cd5b98bd98852..85763cb6a16059f8621dd4a98e7d0b92e437b803 100644 (file)
--- a/lib/libdm-common.h.in
+++ b/lib/libdm-common.h.in
@@ -14,7 +14,7 @@
 #define _LOG_ERR 3
 #define _LOG_FATAL 2
 
-extern dm_log_fn _log;
+dm_log_fn _log;
 
 #define log_error(msg, x...) _log(_LOG_ERR, __FILE__, __LINE__, msg, ## x)
 #define log_print(msg, x...) _log(_LOG_WARN, __FILE__, __LINE__, msg, ## x)
@@ -22,9 +22,9 @@ extern dm_log_fn _log;
 #define log_very_verbose(msg, x...) _log(_LOG_INFO, __FILE__, __LINE__, msg, ## x)
 #define log_debug(msg, x...) _log(_LOG_DEBUG, __FILE__, __LINE__, msg, ## x)
 
-extern struct target *create_target(uint64_t start,
-                                     uint64_t len,
-                                     const char *type, const char *params);
+struct target *create_target(uint64_t start,
+                             uint64_t len,
+                             const char *type, const char *params);
 
 int add_dev_node(const char *dev_name, dev_t dev);
 int rm_dev_node(const char *dev_name);

diff --git a/make.tmpl.in b/make.tmpl.in
index 9906164b1ef707da4b9659c1765858c0f616fa3c..fcfd1b1f68228b6d74b84251b947365d30cbf851 100644 (file)
--- a/make.tmpl.in
+++ b/make.tmpl.in
@@ -104,8 +104,9 @@ $(SUBDIRS.distclean):
 %.o: %.c
        $(CC) -c $(INCLUDES) $(CFLAGS) $< -o $@
 
-%.so: $(OBJECTS)
-       $(CC) -shared -Wl,-soname,$(notdir $@).$(LIB_VERSION) $(OBJECTS) -o $@
+%.so: $(OBJECTS) .export.sym
+       $(CC) -shared -Wl,-soname,$(notdir $@).$(LIB_VERSION) \
+       -Wl,--version-script,.export.sym $(OBJECTS) -o $@
 
 %.d: %.c
        set -e; \