From: norbert.bizet Date: Wed, 12 Oct 2022 15:44:45 +0000 (-0400) Subject: cloud: remove useless edit_device_codes function X-Git-Tag: Beta-15.0.0~417 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63903783b4187f85de0ba5ec39c19abf9b614a29;p=thirdparty%2Fbacula.git cloud: remove useless edit_device_codes function --- diff --git a/bacula/src/stored/generic_driver.c b/bacula/src/stored/generic_driver.c index 18d839b6d..6819c8563 100644 --- a/bacula/src/stored/generic_driver.c +++ b/bacula/src/stored/generic_driver.c @@ -285,68 +285,6 @@ bool generic_driver::init(CLOUD *cloud, POOLMEM *&err) { return false; } -/* -%w : pwd -%b : bucket name -%u : userID -%f : cache file path (file system) -%c : cloud path -%v : volume name -%o : command - -NOTE : this is not used anymore. Parameter order is fixed. See pipe_fct -*/ -char *generic_driver::edit_device_codes( - char *omsg, - const char *cmd, - const char *cache_path_name, - const char *cloud_path_name, - const char *volume_name) -{ - const char *p; - const char *str; - char add[20]; - - *omsg = 0; - Dmsg1(dbglvl, "generic_driver::edit_device_codes: %s\n", NPRTB(driver_command)); - for (p=driver_command; *p; p++) { - if (*p == '%') { - switch (*++p) { - case '%': - str = "%"; - break; - case 'f': - str = NPRT(cache_path_name); - break; - case 'c': - str = NPRT(cloud_path_name); - break; - case 'v': - str = NPRT(volume_name); - break; - case 'o': - str = NPRT(cmd); - break; - default: - add[0] = '%'; - add[1] = *p; - add[2] = 0; - str = add; - break; - } - } else { - add[0] = *p; - add[1] = 0; - str = add; - } - Dmsg1(dbglvl, "add_str %s\n", str); - pm_strcat(&omsg, (char *)str); - Dmsg1(dbglvl, "omsg=%s\n", omsg); - } - Dmsg1(dbglvl, "omsg=%s\n", omsg); - return omsg; -} - /* helper to handler close_bpipe error code */ int handle_error(int stat, POOLMEM *&err) { diff --git a/bacula/src/stored/generic_driver.h b/bacula/src/stored/generic_driver.h index f13cff8e4..c624608ad 100644 --- a/bacula/src/stored/generic_driver.h +++ b/bacula/src/stored/generic_driver.h @@ -117,14 +117,6 @@ public: bool get_cloud_volume_parts_list(const char* volume_name, ilist *parts, cancel_callback *cancel_cb, POOLMEM *&err); bool get_cloud_volumes_list(alist *volumes, cancel_callback *cancel_cb, POOLMEM *&err); -private: - char *edit_device_codes( - char *omsg, - const char *cmd, - const char *cache_path_name = 0, - const char *cloud_path_name = 0, - const char *volume_name = 0); - private: POOLMEM *access_key_env; POOLMEM *secret_key_env;