summaryrefslogtreecommitdiffstats
path: root/libopkg/opkg_download.c
diff options
context:
space:
mode:
authorgraham.gower <graham.gower@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358>2009-11-26 23:09:15 (EST)
committer graham.gower <graham.gower@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358>2009-11-26 23:09:15 (EST)
commitbd1c5142701e7cdd2176a951feabdf852f3ead57 (patch)
tree5e312d2928bc769e0af7cd4c860278fc909f4007 /libopkg/opkg_download.c
parent8fdd042394b7395c13bee66afb45dd3875c60c63 (diff)
Fix some errno abuse.
git-svn-id: http://opkg.googlecode.com/svn/trunk@393 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358
Diffstat (limited to 'libopkg/opkg_download.c')
-rw-r--r--libopkg/opkg_download.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/libopkg/opkg_download.c b/libopkg/opkg_download.c
index a92a2ad..0cc3da2 100644
--- a/libopkg/opkg_download.c
+++ b/libopkg/opkg_download.c
@@ -88,13 +88,12 @@ int opkg_download(opkg_conf_t *conf, const char *src,
opkg_message(conf,OPKG_NOTICE,"Downloading %s\n", src);
if (str_starts_with(src, "file:")) {
- int ret;
const char *file_src = src + 5;
opkg_message(conf,OPKG_INFO,"Copying %s to %s...", file_src, dest_file_name);
- ret = file_copy(src + 5, dest_file_name);
+ err = file_copy(file_src, dest_file_name);
opkg_message(conf,OPKG_INFO,"Done\n");
free(src_basec);
- return ret;
+ return err;
}
sprintf_alloc(&tmp_file_location, "%s/%s", conf->tmp_dir, src_base);
@@ -104,7 +103,7 @@ int opkg_download(opkg_conf_t *conf, const char *src,
__FUNCTION__, tmp_file_location, strerror(errno));
free(tmp_file_location);
free(src_basec);
- return errno;
+ return -1;
}
if (conf->http_proxy) {
@@ -181,11 +180,7 @@ int opkg_download(opkg_conf_t *conf, const char *src,
free(tmp_file_location);
free(src_basec);
- if (err) {
- return err;
- }
-
- return 0;
+ return err;
}
static int opkg_download_cache(opkg_conf_t *conf, const char *src,