diff options
| author | Justin Mitchell <jumitche@rehat.com> | 2017-05-05 11:03:20 -0400 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2017-05-05 11:04:19 -0400 |
| commit | 7b33590fee9515e49cda460285acc5d347a800b5 (patch) | |
| tree | 8f6f30a0671155e93c5029f15c37181755aa3704 /utils/blkmapd | |
| parent | 06bbb4ee6f5186e8e83d50767ad5b3b41968e5a6 (diff) | |
| download | nfs-utils-7b33590fee9515e49cda460285acc5d347a800b5.tar.gz nfs-utils-7b33590fee9515e49cda460285acc5d347a800b5.tar.xz nfs-utils-7b33590fee9515e49cda460285acc5d347a800b5.zip | |
config: Remove the conf_path global
Working towards an nfs.conf library and API for system config tools,
first step, replace the conf_path global with a parameter to conf_init
Signed-off-by: Justin Mitchell <jumitche@rehat.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
Diffstat (limited to 'utils/blkmapd')
| -rw-r--r-- | utils/blkmapd/device-discovery.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/utils/blkmapd/device-discovery.c b/utils/blkmapd/device-discovery.c index d2da764..c66669d 100644 --- a/utils/blkmapd/device-discovery.c +++ b/utils/blkmapd/device-discovery.c @@ -78,7 +78,6 @@ static char rpcpipe_dir[PATH_MAX]; struct bl_disk *visible_disk_list; int bl_watch_fd, bl_pipe_fd, nfs_pipedir_wfd, rpc_pipedir_wfd; int pidfd = -1; -char *conf_path = NULL; struct bl_disk_path *bl_get_path(const char *filepath, @@ -456,8 +455,7 @@ int main(int argc, char **argv) char *xrpcpipe_dir = NULL; strncpy(rpcpipe_dir, RPCPIPE_DIR, sizeof(rpcpipe_dir)); - conf_path = NFS_CONFFILE; - conf_init(); + conf_init(NFS_CONFFILE); CONF_SAVE(xrpcpipe_dir, conf_get_str("general", "pipefs-directory")); if (xrpcpipe_dir != NULL) strlcpy(rpcpipe_dir, xrpcpipe_dir, sizeof(rpcpipe_dir)); |