bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

prefix fetch based functions with fetch_

Browse source 
Do this in preparation for implementing similar curl based
functionality. We want the ability to test these side by side.

Signed-off-by: Dave Reisner <d@falconindy.com>
This commit is contained in:
Dave Reisner 2011-01-12 09:51:06 -05:00
parent 278c847106
commit 159e1b06a5
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/libalpm/dload.c
View file

@ -80,7 +80,7 @@ static char *get_tempfile(const char *path, const char *filename) {
return(tempfile); return(tempfile);
} }
static const char *gethost(struct url *fileurl) static const char *fetch_gethost(struct url *fileurl)
{ {
const char *host = _("disk"); const char *host = _("disk");
if(strcmp(SCHEME_FILE, fileurl->scheme) != 0) { if(strcmp(SCHEME_FILE, fileurl->scheme) != 0) {
@ -98,7 +98,7 @@ static void inthandler(int signum)
#define check_stop() if(dload_interrupted) { ret = -1; goto cleanup; } #define check_stop() if(dload_interrupted) { ret = -1; goto cleanup; }
enum sighandlers { OLD = 0, NEW = 1 }; enum sighandlers { OLD = 0, NEW = 1 };
static int download_internal(const char *url, const char *localpath, static int fetch_download_internal(const char *url, const char *localpath,
int force) { int force) {
FILE *localf = NULL; FILE *localf = NULL;
struct stat st; struct stat st;
@ -191,7 +191,7 @@ static int download_internal(const char *url, const char *localpath,
if(fetchStat(fileurl, &ust, "") == -1) { if(fetchStat(fileurl, &ust, "") == -1) {
pm_errno = PM_ERR_LIBFETCH; pm_errno = PM_ERR_LIBFETCH;
_alpm_log(PM_LOG_ERROR, _("failed retrieving file '%s' from %s : %s\n"), _alpm_log(PM_LOG_ERROR, _("failed retrieving file '%s' from %s : %s\n"),
filename, gethost(fileurl), fetchLastErrString); filename, fetch_gethost(fileurl), fetchLastErrString);
ret = -1; ret = -1;
goto cleanup; goto cleanup;
} }
@ -221,7 +221,7 @@ static int download_internal(const char *url, const char *localpath,
if(fetchLastErrCode != 0 || dlf == NULL) { if(fetchLastErrCode != 0 || dlf == NULL) {
pm_errno = PM_ERR_LIBFETCH; pm_errno = PM_ERR_LIBFETCH;
_alpm_log(PM_LOG_ERROR, _("failed retrieving file '%s' from %s : %s\n"), _alpm_log(PM_LOG_ERROR, _("failed retrieving file '%s' from %s : %s\n"),
filename, gethost(fileurl), fetchLastErrString); filename, fetch_gethost(fileurl), fetchLastErrString);
ret = -1; ret = -1;
goto cleanup; goto cleanup;
} else { } else {
@ -279,7 +279,7 @@ static int download_internal(const char *url, const char *localpath,
/* not PM_ERR_LIBFETCH here because libfetch error string might be empty */ /* not PM_ERR_LIBFETCH here because libfetch error string might be empty */
pm_errno = PM_ERR_RETRIEVE; pm_errno = PM_ERR_RETRIEVE;
_alpm_log(PM_LOG_ERROR, _("failed retrieving file '%s' from %s\n"), _alpm_log(PM_LOG_ERROR, _("failed retrieving file '%s' from %s\n"),
filename, gethost(fileurl)); filename, fetch_gethost(fileurl));
ret = -1; ret = -1;
goto cleanup; goto cleanup;
} }
@ -352,7 +352,7 @@ static int download(const char *url, const char *localpath,
int force) { int force) {
if(handle->fetchcb == NULL) { if(handle->fetchcb == NULL) {
#ifdef HAVE_LIBFETCH #ifdef HAVE_LIBFETCH
return(download_internal(url, localpath, force)); return(fetch_download_internal(url, localpath, force));
#else #else
RET_ERR(PM_ERR_EXTERNAL_DOWNLOAD, -1); RET_ERR(PM_ERR_EXTERNAL_DOWNLOAD, -1);
#endif #endif