X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib-lib%2Ffile.c;fp=lib-lib%2Ffile.c;h=985015f0da26fb904e350b4f4fef0017d8481d8b;hb=ac813896ca32d850febc2d95065ac4fa040f11f9;hp=22bb68ced722373f766d8ae68eb65600283757f5;hpb=10e80e482eff3762b0b8d41b0c7795b76704479c;p=apps%2Fmadmutt.git diff --git a/lib-lib/file.c b/lib-lib/file.c index 22bb68c..985015f 100644 --- a/lib-lib/file.c +++ b/lib-lib/file.c @@ -259,9 +259,9 @@ int safe_fclose(FILE **f) * If a line ends with "\", this char and the linefeed is removed, * and the next line is read too. */ -char *mutt_read_line(char *s, size_t *size, FILE * fp, int *line) +char *mutt_read_line(char *s, ssize_t *size, FILE * fp, int *line) { - size_t offset = 0; + ssize_t offset = 0; char *ch; if (!s) { @@ -310,7 +310,7 @@ int mutt_copy_stream(FILE *fin, FILE *fout) char buf[BUFSIZ]; size_t l; - while ((l = fread(buf, 1, sizeof (buf), fin)) > 0) { + while ((l = fread(buf, 1, sizeof(buf), fin)) > 0) { if (fwrite(buf, 1, l, fout) != l) return -1; } @@ -318,12 +318,12 @@ int mutt_copy_stream(FILE *fin, FILE *fout) return 0; } -int mutt_copy_bytes(FILE *in, FILE *out, size_t size) +int mutt_copy_bytes(FILE *in, FILE *out, ssize_t size) { char buf[BUFSIZ]; while (size > 0) { - size_t chunk = MIN(size, sizeof(buf)); + size_t chunk = MIN(size, ssizeof(buf)); if ((chunk = fread(buf, 1, chunk, in)) < 1) break;