mirror of
https://github.com/moparisthebest/pacman
synced 2024-08-13 17:03:46 -04:00
dload: mark final_url as const
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
parent
91876c21f1
commit
d649dc669d
@ -209,8 +209,7 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db)
|
|||||||
}
|
}
|
||||||
|
|
||||||
for(i = db->servers; i; i = i->next) {
|
for(i = db->servers; i; i = i->next) {
|
||||||
char *final_db_url = NULL;
|
const char *server = i->data, *final_db_url = NULL;
|
||||||
const char *server = i->data;
|
|
||||||
struct dload_payload payload;
|
struct dload_payload payload;
|
||||||
size_t len;
|
size_t len;
|
||||||
int sig_ret = 0;
|
int sig_ret = 0;
|
||||||
|
@ -388,7 +388,7 @@ static FILE *create_tempfile(struct dload_payload *payload, const char *localpat
|
|||||||
#define HOSTNAME_SIZE 256
|
#define HOSTNAME_SIZE 256
|
||||||
|
|
||||||
static int curl_download_internal(struct dload_payload *payload,
|
static int curl_download_internal(struct dload_payload *payload,
|
||||||
const char *localpath, char **final_file, char **final_url)
|
const char *localpath, char **final_file, const char **final_url)
|
||||||
{
|
{
|
||||||
int ret = -1;
|
int ret = -1;
|
||||||
FILE *localf = NULL;
|
FILE *localf = NULL;
|
||||||
@ -622,7 +622,7 @@ cleanup:
|
|||||||
* @return 0 on success, -1 on error (pm_errno is set accordingly if errors_ok == 0)
|
* @return 0 on success, -1 on error (pm_errno is set accordingly if errors_ok == 0)
|
||||||
*/
|
*/
|
||||||
int _alpm_download(struct dload_payload *payload, const char *localpath,
|
int _alpm_download(struct dload_payload *payload, const char *localpath,
|
||||||
char **final_file, char **final_url)
|
char **final_file, const char **final_url)
|
||||||
{
|
{
|
||||||
alpm_handle_t *handle = payload->handle;
|
alpm_handle_t *handle = payload->handle;
|
||||||
|
|
||||||
@ -664,8 +664,8 @@ static char *filecache_find_url(alpm_handle_t *handle, const char *url)
|
|||||||
char SYMEXPORT *alpm_fetch_pkgurl(alpm_handle_t *handle, const char *url)
|
char SYMEXPORT *alpm_fetch_pkgurl(alpm_handle_t *handle, const char *url)
|
||||||
{
|
{
|
||||||
char *filepath;
|
char *filepath;
|
||||||
const char *cachedir;
|
const char *cachedir, *final_pkg_url = NULL;
|
||||||
char *final_file = NULL, *final_pkg_url = NULL;
|
char *final_file = NULL;
|
||||||
struct dload_payload payload;
|
struct dload_payload payload;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
|
@ -49,7 +49,7 @@ struct dload_payload {
|
|||||||
void _alpm_dload_payload_reset(struct dload_payload *payload);
|
void _alpm_dload_payload_reset(struct dload_payload *payload);
|
||||||
|
|
||||||
int _alpm_download(struct dload_payload *payload, const char *localpath,
|
int _alpm_download(struct dload_payload *payload, const char *localpath,
|
||||||
char **final_file, char **final_url);
|
char **final_file, const char **final_url);
|
||||||
|
|
||||||
#endif /* _ALPM_DLOAD_H */
|
#endif /* _ALPM_DLOAD_H */
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user