From 49ade5af490e622cd9210b284a43faf34274231b Mon Sep 17 00:00:00 2001
From: Caelan Sayler <git@caesay.com>
Date: Sat, 11 Jan 2025 08:52:31 +0000
Subject: [PATCH] Fix bug in C http_source not being initialised

---
 src/lib-cpp/src/lib.rs      | 5 ++++-
 src/lib-rust/src/sources.rs | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/lib-cpp/src/lib.rs b/src/lib-cpp/src/lib.rs
index 3575e8bc..b011d020 100644
--- a/src/lib-cpp/src/lib.rs
+++ b/src/lib-cpp/src/lib.rs
@@ -25,6 +25,7 @@ pub extern "C" fn vpkc_new_source_file(psz_file_path: *const c_char) -> *mut vpk
     if let Some(update_path) = c_to_string_opt(psz_file_path) {
         UpdateSourceRawPtr::new(Box::new(sources::FileSource::new(update_path)))
     } else {
+        log::error!("psz_file_path is null");
         ptr::null_mut()
     }
 }
@@ -35,8 +36,9 @@ pub extern "C" fn vpkc_new_source_file(psz_file_path: *const c_char) -> *mut vpk
 #[logfn_inputs(Trace)]
 pub extern "C" fn vpkc_new_source_http_url(psz_http_url: *const c_char) -> *mut vpkc_update_source_t {
     if let Some(update_url) = c_to_string_opt(psz_http_url) {
-        UpdateSourceRawPtr::new(Box::new(sources::FileSource::new(update_url)))
+        UpdateSourceRawPtr::new(Box::new(sources::HttpSource::new(update_url)))
     } else {
+        log::error!("psz_http_url is null");
         ptr::null_mut()
     }
 }
@@ -56,6 +58,7 @@ pub extern "C" fn vpkc_new_source_custom_callback(
     p_user_data: *mut c_void,
 ) -> *mut vpkc_update_source_t {
     if cb_release_feed.is_none() || cb_download_entry.is_none() || cb_free_release_feed.is_none() {
+        log::error!("cb_release_feed, cb_download_entry, or cb_free_release_feed is null");
         return ptr::null_mut();
     }
 
diff --git a/src/lib-rust/src/sources.rs b/src/lib-rust/src/sources.rs
index d6abf617..3e90851f 100644
--- a/src/lib-rust/src/sources.rs
+++ b/src/lib-rust/src/sources.rs
@@ -91,8 +91,8 @@ pub struct HttpSource {
 
 impl HttpSource {
     /// Create a new HttpSource with the specified base URL.
-    pub fn new(url: &str) -> HttpSource {
-        HttpSource { url: url.to_owned() }
+    pub fn new<S: AsRef<str>>(url: S) -> HttpSource {
+        HttpSource { url: url.as_ref().to_owned() }
     }
 }