moparisthebest
/
pacman
mirror of https://github.com/moparisthebest/pacman
1
0
Fork 0
Code Issues Releases Wiki Activity

dload: mark final_url as const 

Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Christian Hesse 2014-10-16 15:36:55 +02:00 committed by Allan McRae
parent 91876c21f1
commit d649dc669d
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/libalpm/be_sync.c
View File

@ -209,8 +209,7 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db)
}
for(i = db->servers; i; i = i->next) {
char *final_db_url = NULL;
const char *server = i->data;
const char *server = i->data, *final_db_url = NULL;
struct dload_payload payload;
size_t len;
int sig_ret = 0;

8
lib/libalpm/dload.c
View File

@ -388,7 +388,7 @@ static FILE *create_tempfile(struct dload_payload *payload, const char *localpat
#define HOSTNAME_SIZE 256
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;
FILE *localf = NULL;
@ -622,7 +622,7 @@ cleanup:
* @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,
char **final_file, char **final_url)
char **final_file, const char **final_url)
{
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 *filepath;
const char *cachedir;
char *final_file = NULL, *final_pkg_url = NULL;
const char *cachedir, *final_pkg_url = NULL;
char *final_file = NULL;
struct dload_payload payload;
int ret = 0;

2
lib/libalpm/dload.h
View File

@ -49,7 +49,7 @@ struct dload_payload {
void _alpm_dload_payload_reset(struct dload_payload *payload);
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 */