From 8e1dc87dcc29975d35a25c3f125ddf45a9c7fa26 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rados=C5=82aw=20Korzeniewski?= Date: Thu, 14 Jan 2021 11:55:01 +0100 Subject: [PATCH] pluginlib: Fix linking problem. --- bacula/src/plugins/fd/pluginlib/pluginlib.cpp | 10 +++++----- bacula/src/plugins/fd/pluginlib/pluginlib.h | 15 +++++++-------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/bacula/src/plugins/fd/pluginlib/pluginlib.cpp b/bacula/src/plugins/fd/pluginlib/pluginlib.cpp index 0b79f8ec1..67016d114 100644 --- a/bacula/src/plugins/fd/pluginlib/pluginlib.cpp +++ b/bacula/src/plugins/fd/pluginlib/pluginlib.cpp @@ -315,7 +315,7 @@ alist * plugutil_str_split_to_alist(const char * str, const char sep) * True if parameter was rendered * False if it was not the parameter required */ -bool render_param(POOLMEM **param, const char *pname, const char *fmt, const char *name, char *value) +bool render_param(POOLMEM **param, const char *pname, const char *fmt, const char *name, const char *value) { if (bstrcasecmp(name, pname)){ if (!*param){ @@ -342,7 +342,7 @@ bool render_param(POOLMEM **param, const char *pname, const char *fmt, const cha * True if parameter was rendered * False if it was not the parameter required */ -bool render_param(POOLMEM **param, const char *pname, const char *fmt, const char *name, int value) +bool render_param(POOLMEM **param, const char *pname, const char *fmt, const char *name, const int value) { if (bstrcasecmp(name, pname)){ if (!*param){ @@ -365,7 +365,7 @@ bool render_param(POOLMEM **param, const char *pname, const char *fmt, const cha * @return true * @return false */ -bool parse_param(POOL_MEM ¶m, const char *pname, const char *name, char *value) +bool parse_param(POOL_MEM ¶m, const char *pname, const char *name, const char *value) { if (bstrcasecmp(name, pname)){ pm_strcpy(param, value); @@ -389,7 +389,7 @@ bool parse_param(POOL_MEM ¶m, const char *pname, const char *name, char *val * False if it was not the parameter required */ // TODO: It should be called setup_param -bool render_param(bool ¶m, const char *pname, const char *name, bool value) +bool render_param(bool ¶m, const char *pname, const char *name, const bool value) { if (bstrcasecmp(name, pname)) { @@ -517,7 +517,7 @@ bool parse_param(bool ¶m, const char *pname, const char *name, const char *v * @return true * @return false */ -bool parse_param(int ¶m, const char *pname, const char *name, char *value, bool * err) +bool parse_param(int ¶m, const char *pname, const char *name, const char *value, bool * err) { // clear error flag when requested if (err != NULL) *err = false; diff --git a/bacula/src/plugins/fd/pluginlib/pluginlib.h b/bacula/src/plugins/fd/pluginlib/pluginlib.h index 745158553..b0e4de058 100644 --- a/bacula/src/plugins/fd/pluginlib/pluginlib.h +++ b/bacula/src/plugins/fd/pluginlib/pluginlib.h @@ -156,14 +156,13 @@ inline bool isourplugincommand(const char *pluginprefix, const char *command) alist * plugutil_str_split_to_alist(const char * str, const char sep = '.'); /* plugin parameters manipulation */ -bool render_param(POOLMEM **param, const char *pname, const char *fmt, const char *name, char *value); -bool render_param(POOLMEM **param, const char *pname, const char *fmt, const char *name, int value); -bool render_param(bool ¶m, const char *pname, const char *name, bool value); - -bool parse_param(bool ¶m, const char *pname, const char *name, char *value); -bool parse_param(int ¶m, const char *pname, const char *name, char *value, bool *err = NULL); -// inline bool parse_param(int32_t ¶m, const char *pname, const char *name, char *value, bool *err = NULL) { return parse_param((int&)param, pname, name, value, err); } -bool parse_param(POOL_MEM ¶m, const char *pname, const char *name, char *value); +bool render_param(POOLMEM **param, const char *pname, const char *fmt, const char *name, const char *value); +bool render_param(POOLMEM **param, const char *pname, const char *fmt, const char *name, const int value); +bool render_param(bool ¶m, const char *pname, const char *name, const bool value); + +bool parse_param(bool ¶m, const char *pname, const char *name, const char *value); +bool parse_param(int ¶m, const char *pname, const char *name, const char *value, bool *err = NULL); +bool parse_param(POOL_MEM ¶m, const char *pname, const char *name, const char *value); bool setup_param(int32_t ¶m, const char *pname, const char *name, const int32_t value); bool setup_param(bool ¶m, const char *pname, const char *name, const bool value); -- 2.47.3