From f7192b595881103f145a118d63d1b342ffd740b4 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Mon, 17 Nov 2008 21:47:55 -0600
Subject: Minor code cleanups
Mostly noticed when compiling libalpm/pacman with ICC.
Signed-off-by: Dan McGee <dan@archlinux.org>
---
lib/libalpm/be_files.c | 6 +++---
lib/libalpm/dload.c | 10 ++++------
2 files changed, 7 insertions(+), 9 deletions(-)
(limited to 'lib/libalpm')
diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c
index f5d4e826..0658a661 100644
--- a/lib/libalpm/be_files.c
+++ b/lib/libalpm/be_files.c
@@ -51,7 +51,7 @@
* Return the last update time as number of seconds from the epoch.
* Returns 0 if the value is unknown or can't be read.
*/
-time_t getlastupdate(const pmdb_t *db)
+static time_t getlastupdate(const pmdb_t *db)
{
FILE *fp;
char *file;
@@ -85,7 +85,7 @@ time_t getlastupdate(const pmdb_t *db)
/*
* writes the dbpath/.lastupdate file with the value in time
*/
-int setlastupdate(const pmdb_t *db, time_t time)
+static int setlastupdate(const pmdb_t *db, time_t time)
{
FILE *fp;
char *file;
@@ -500,7 +500,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
if(fgets(line, 512, fp) == NULL) {
goto error;
}
- info->reason = atol(_alpm_strtrim(line));
+ info->reason = (pmpkgreason_t)atol(_alpm_strtrim(line));
} else if(strcmp(line, "%SIZE%") == 0 || strcmp(line, "%CSIZE%") == 0) {
/* NOTE: the CSIZE and SIZE fields both share the "size" field
* in the pkginfo_t struct. This can be done b/c CSIZE
diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c
index c07040b5..9b082943 100644
--- a/lib/libalpm/dload.c
+++ b/lib/libalpm/dload.c
@@ -111,11 +111,11 @@ static int download_internal(const char *url, const char *localpath,
FILE *dlf, *localf = NULL;
struct url_stat ust;
struct stat st;
- int chk_resume = 0;
- size_t dl_thisfile = 0;
+ int chk_resume = 0, ret = 0;
+ size_t dl_thisfile = 0, nread = 0;
char *tempfile, *destfile, *filename;
- int ret = 0;
struct url *fileurl = url_for_string(url);
+ char buffer[PM_DLBUF_LEN];
if(!fileurl) {
return(-1);
@@ -200,9 +200,8 @@ static int download_internal(const char *url, const char *localpath,
handle->dlcb(filename, 0, ust.size);
}
- size_t nread = 0;
- char buffer[PM_DLBUF_LEN];
while((nread = fread(buffer, 1, PM_DLBUF_LEN, dlf)) > 0) {
+ size_t nwritten = 0;
if(ferror(dlf)) {
pm_errno = PM_ERR_LIBDOWNLOAD;
_alpm_log(PM_LOG_ERROR, _("error downloading '%s': %s\n"),
@@ -211,7 +210,6 @@ static int download_internal(const char *url, const char *localpath,
goto cleanup;
}
- size_t nwritten = 0;
while(nwritten < nread) {
nwritten += fwrite(buffer, 1, (nread - nwritten), localf);
if(ferror(localf)) {
--
cgit v1.2.3-70-g09d2