index : pacman | |
Archlinux32 fork of pacman | gitolite user |
summaryrefslogtreecommitdiff |
author | Rikard Falkeborn <rikard.falkeborn@gmail.com> | 2015-11-10 20:51:55 +0100 |
---|---|---|
committer | Allan McRae <allan@archlinux.org> | 2015-11-11 13:47:08 +1000 |
commit | 9e22e75fa195b17efb6ad911e0e9910330e8a30a (patch) | |
tree | e76ef827e8d94f6b6a9811c6c94fdcfcca4962b4 /lib | |
parent | bf0e8e6b435f0ab28745d6f6d3279dc66ac3e9ef (diff) |
-rw-r--r-- | lib/libalpm/diskspace.c | 2 | ||||
-rw-r--r-- | lib/libalpm/dload.c | 2 | ||||
-rw-r--r-- | lib/libalpm/remove.c | 2 | ||||
-rw-r--r-- | lib/libalpm/util.c | 2 |
diff --git a/lib/libalpm/diskspace.c b/lib/libalpm/diskspace.c index aaa00365..5bb2173c 100644 --- a/lib/libalpm/diskspace.c +++ b/lib/libalpm/diskspace.c @@ -349,7 +349,7 @@ static int check_mountpoint(alpm_handle_t *handle, alpm_mountpoint_t *mp) (uintmax_t)cushion, (uintmax_t)mp->fsp.f_bfree); if(needed >= 0 && (fsblkcnt_t)needed > mp->fsp.f_bfree) { _alpm_log(handle, ALPM_LOG_ERROR, - _("Partition %s too full: %jd blocks needed, %jd blocks free\n"), + _("Partition %s too full: %jd blocks needed, %ju blocks free\n"), mp->mount_dir, (intmax_t)needed, (uintmax_t)mp->fsp.f_bfree); return 1; } diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 63523aa3..f3df9cd9 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -323,7 +323,7 @@ static void curl_set_handle_opts(struct dload_payload *payload, curl_easy_setopt(curl, CURLOPT_TIMECONDITION, CURL_TIMECOND_IFMODSINCE); curl_easy_setopt(curl, CURLOPT_TIMEVALUE, (long)st.st_mtime); _alpm_log(handle, ALPM_LOG_DEBUG, - "using time condition: %lu\n", (long)st.st_mtime); + "using time condition: %ld\n", (long)st.st_mtime); } else if(stat(payload->tempfile_name, &st) == 0 && payload->allow_resume) { /* a previous partial download exists, resume from end of file. */ payload->tempfile_openmode = "ab"; diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index bc5713a6..2fb79931 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -599,7 +599,7 @@ static int remove_package_files(alpm_handle_t *handle, } } - _alpm_log(handle, ALPM_LOG_DEBUG, "removing %zd files\n", filelist->count); + _alpm_log(handle, ALPM_LOG_DEBUG, "removing %zu files\n", filelist->count); if(!newpkg) { /* init progress bar, but only on true remove transactions */ diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 66a27426..955bf6f5 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -1290,7 +1290,7 @@ void *_alpm_greedy_grow(void **data, size_t *current, const size_t required) void _alpm_alloc_fail(size_t size) { - fprintf(stderr, "alloc failure: could not allocate %zd bytes\n", size); + fprintf(stderr, "alloc failure: could not allocate %zu bytes\n", size); } /* vim: set noet: */ |