From 2f127cb64e0cc8e4c4ce2961757abbf9e92a2df8 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Thu, 5 Apr 2018 14:50:45 -0400 Subject: gfapi: fix a couple of minor issues duplicatation of exported functions in gfapi.map. Only the newest one is needed. Both the legacy and current symbols are exported. glfs_realpath34() decl should not be in glfs.h. Period. Old applications were compiled with the then glfs_realpath() decl and linked with glfs_realpath@@GFAPI_3_4.0. New applications should only call glfs_realpath() and it will be linked to the new/current glfs_realpath(). master: https://review.gluster.org/19828 master: bz#1564235 Change-Id: Icd5b0c9e9b68f0c133f14447b09ace35f33dbab2 BUG: 1564461 fixes: bz#1564461 Signed-off-by: Kaleb S. KEITHLEY --- api/src/gfapi.map | 2 -- api/src/glfs.h | 3 --- 2 files changed, 5 deletions(-) diff --git a/api/src/gfapi.map b/api/src/gfapi.map index 4dc20e33f4d..3ba5c646462 100644 --- a/api/src/gfapi.map +++ b/api/src/gfapi.map @@ -87,7 +87,6 @@ GFAPI_3.4.0 { glfs_getcwd; glfs_chdir; glfs_fchdir; - glfs_realpath; glfs_posix_lock; glfs_dup; } GFAPI_PRIVATE_3.4.0; @@ -97,7 +96,6 @@ GFAPI_3.4.2 { glfs_setfsuid; glfs_setfsgid; glfs_setfsgroups; - glfs_h_lookupat; glfs_h_creat; glfs_h_mkdir; glfs_h_mknod; diff --git a/api/src/glfs.h b/api/src/glfs.h index 4613cd193ea..e5a3eba2e8f 100644 --- a/api/src/glfs.h +++ b/api/src/glfs.h @@ -763,9 +763,6 @@ int glfs_chdir (glfs_t *fs, const char *path) __THROW int glfs_fchdir (glfs_fd_t *fd) __THROW GFAPI_PUBLIC(glfs_fchdir, 3.4.0); -char *glfs_realpath34 (glfs_t *fs, const char *path, char *resolved_path) __THROW - GFAPI_PUBLIC(glfs_realpath, 3.4.0); - char *glfs_realpath (glfs_t *fs, const char *path, char *resolved_path) __THROW GFAPI_PUBLIC(glfs_realpath, 3.7.17); /* -- cgit