Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/lib/libalpm
diff options
context:
space:
mode:
authorAndrew Gregory <andrew.gregory.8@gmail.com>2021-01-15 23:21:00 -0800
committerAllan McRae <allan@archlinux.org>2021-01-19 12:39:10 +1000
commit79227dabe07c43b5a208696312a42b00a328398d (patch)
tree4b7f6dfc928d3662a79d3079d327e5289d13a7cf /lib/libalpm
parent8ed98023b45d1cdea4217f7152dcdc77944a0ea7 (diff)
make alpm download config accessible without curl
Download-related config options are currently limited to builds with curl. This causes compilation errors when those options are used without an appropriate guard which often goes unnoticed because we all use curl. Front-ends providing their own download callback may also want to use these settings. Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'lib/libalpm')
-rw-r--r--lib/libalpm/handle.c12
-rw-r--r--lib/libalpm/handle.h3
2 files changed, 2 insertions, 13 deletions
diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c
index 3994f314..0444ee5d 100644
--- a/lib/libalpm/handle.c
+++ b/lib/libalpm/handle.c
@@ -303,11 +303,7 @@ const char SYMEXPORT *alpm_option_get_dbext(alpm_handle_t *handle)
int SYMEXPORT alpm_option_get_parallel_downloads(alpm_handle_t *handle)
{
CHECK_HANDLE(handle, return -1);
-#ifdef HAVE_LIBCURL
return handle->parallel_downloads;
-#else
- return 1;
-#endif
}
int SYMEXPORT alpm_option_set_logcb(alpm_handle_t *handle, alpm_cb_log cb)
@@ -854,11 +850,7 @@ int SYMEXPORT alpm_option_set_disable_dl_timeout(alpm_handle_t *handle,
unsigned short disable_dl_timeout)
{
CHECK_HANDLE(handle, return -1);
-#ifdef HAVE_LIBCURL
handle->disable_dl_timeout = disable_dl_timeout;
-#else
- (void)disable_dl_timeout; /* silence unused variable warnings */
-#endif
return 0;
}
@@ -866,11 +858,7 @@ int SYMEXPORT alpm_option_set_parallel_downloads(alpm_handle_t *handle,
unsigned int num_streams)
{
CHECK_HANDLE(handle, return -1);
-#ifdef HAVE_LIBCURL
ASSERT(num_streams >= 1, RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1));
handle->parallel_downloads = num_streams;
-#else
- (void)num_streams; /* silence unused variable warnings */
-#endif
return 0;
}
diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h
index 9fef0fbf..3e7d323e 100644
--- a/lib/libalpm/handle.h
+++ b/lib/libalpm/handle.h
@@ -60,9 +60,10 @@ struct __alpm_handle_t {
#ifdef HAVE_LIBCURL
/* libcurl handle */
CURLM *curlm;
+#endif
+
unsigned short disable_dl_timeout;
unsigned int parallel_downloads; /* number of download streams */
-#endif
#ifdef HAVE_LIBGPGME
alpm_list_t *known_keys; /* keys verified to be in our keychain */