summaryrefslogtreecommitdiff
path: root/src/htscore.c
diff options
context:
space:
mode:
authorXavier Roche <xroche@users.noreply.github.com>2014-05-29 08:30:43 +0000
committerXavier Roche <xroche@users.noreply.github.com>2014-05-29 08:30:43 +0000
commit194ebad4c6f4d259d5b2fd7349246ea19493cb04 (patch)
tree49f49c1eb0b73580c86793cd7dfb6168ada583f6 /src/htscore.c
parentae6d05fbb30ca8c0370b2be8cc1810b028616830 (diff)
Added off_t_to_size_t()
Diffstat (limited to 'src/htscore.c')
-rw-r--r--src/htscore.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/htscore.c b/src/htscore.c
index e754c39..31deb57 100644
--- a/src/htscore.c
+++ b/src/htscore.c
@@ -711,9 +711,9 @@ int httpmirror(char *url1, httrackp * opt) {
/* OPTIMIZED for fast load */
if (StringNotEmpty(opt->filelist)) {
char *filelist_buff = NULL;
- off_t filelist_sz = fsize(StringBuff(opt->filelist));
+ const size_t filelist_sz = off_t_to_size_t(fsize(StringBuff(opt->filelist)));
- if (filelist_sz > 0) {
+ if (filelist_sz != (size_t) -1) {
FILE *fp = fopen(StringBuff(opt->filelist), "rb");
if (fp) {
@@ -2149,16 +2149,16 @@ int httpmirror(char *url1, httrackp * opt) {
(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log),
"hts-cache/old.lst"), "rb");
if (old_lst) {
- off_t sz =
- fsize(fconcat
+ const size_t sz =
+ off_t_to_size_t(fsize(fconcat
(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log),
- "hts-cache/new.lst"));
+ "hts-cache/new.lst")));
new_lst =
fopen(fconcat
(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log),
"hts-cache/new.lst"), "rb");
- if ((new_lst) && (sz > 0)) {
- char *adr = (char *) malloct(sz);
+ if (new_lst != NULL && sz != (size_t) -1) {
+ char *const adr = (char *) malloct(sz);
if (adr) {
if (fread(adr, 1, sz, new_lst) == sz) {