Made get_addon_pbl_info return its own config object

src/addon/client.cpp

@@ -157,8 +157,7 @@ bool addons_client::delete_remote_addon(const std::string& id, std::string& resp
 {
 	response_message.clear();
 
-	config cfg;
-	get_addon_pbl_info(id, cfg);
+	config cfg = get_addon_pbl_info(id);
 
 	utils::string_map i18n_symbols;
 	i18n_symbols["addon_title"] = cfg["title"];

src/addon/manager.cpp

@@ -79,15 +79,18 @@ bool have_addon_pbl_info(const std::string& addon_name)
 	return filesystem::file_exists(get_pbl_file_path(addon_name));
 }
 
-void get_addon_pbl_info(const std::string& addon_name, config& cfg)
+config get_addon_pbl_info(const std::string& addon_name)
 {
+	config cfg;
 	const std::string& pbl_path = get_pbl_file_path(addon_name);
 	try {
 		filesystem::scoped_istream stream = filesystem::istream_file(pbl_path);
 		read(cfg, *stream);
 	} catch(const config::error& e) {
 		throw invalid_pbl_exception(pbl_path, e.message);
 	}
+
+	return cfg;
 }
 
 void set_addon_pbl_info(const std::string& addon_name, const config& cfg)

src/addon/manager.hpp

@@ -65,13 +65,11 @@ bool have_addon_in_vcs_tree(const std::string& addon_name);
  * Gets the publish information for an add-on.
  *
  * @param addon_name              The add-on's main directory/file name.
- * @param cfg                     A config object to store the add-on's
- *                                properties.
  *
  * @exception invalid_pbl_exception If it is not possible to read the .pbl file
  *                                  (often due to invalid WML).
  */
-void get_addon_pbl_info(const std::string& addon_name, class config& cfg);
+config get_addon_pbl_info(const std::string& addon_name);
 
 /**
  * Sets the publish information for an add-on

src/addon/manager_ui.cpp

@@ -143,8 +143,7 @@ void do_remote_addon_publish(CVideo& video, addons_client& client, const std::st
 {
 	std::string server_msg;
 
-	config cfg;
-	get_addon_pbl_info(addon_id, cfg);
+	config cfg = get_addon_pbl_info(addon_id);
 
 	const version_info& version_to_publish = cfg["version"].str();
 

src/addon/state.cpp

@@ -33,8 +33,7 @@ addon_tracking_info get_addon_tracking_info(const addon_info& addon)
 	if(is_addon_installed(id)) {
 		if(t.can_publish) {
 			// Try to obtain the version number from the .pbl first.
-			config pbl;
-			get_addon_pbl_info(id, pbl);
+			config pbl = get_addon_pbl_info(id);
 
 			if(pbl.has_attribute("version")) {
 				t.installed_version = pbl["version"].str();

src/gui/dialogs/addon/manager.cpp

@@ -566,8 +566,7 @@ void addon_manager::do_remote_addon_publish(const std::string& addon_id, window&
 {
 	std::string server_msg;
 
-	config cfg;
-	get_addon_pbl_info(addon_id, cfg);
+	config cfg = get_addon_pbl_info(addon_id);
 
 	const version_info& version_to_publish = cfg["version"].str();