commit be659d10a8dd75e169fb7a246f54238dfc4386e8 from: Stefan Sperling date: Wed Nov 18 17:18:23 2020 UTC fix type of filesize output parameter of got_object_blob_dump_to_file() commit - c33ebc60244337a117933351d3565dd850925d06 commit + be659d10a8dd75e169fb7a246f54238dfc4386e8 blob - e0a40321232655aab2023084467d00ae612a4215 blob + d471800beafe3df5995d9268f91ecb6e56f38953 --- got/got.c +++ got/got.c @@ -4438,7 +4438,7 @@ cmd_blame(int argc, char *argv[]) char *commit_id_str = NULL; struct blame_cb_args bca; int ch, obj_type, i; - size_t filesize; + off_t filesize; memset(&bca, 0, sizeof(bca)); blob - 170666b93e4d724f539dbc69aea4b293f3c309ae blob + 34bd7e89c4679726dc8c02598ecb4e602d85347a --- gotweb/gotweb.c +++ gotweb/gotweb.c @@ -3960,7 +3960,7 @@ gw_output_file_blame(struct gw_trans *gw_trans) char *path = NULL, *in_repo_path = NULL; struct gw_blame_cb_args bca; int i, obj_type; - size_t filesize; + off_t filesize; if (asprintf(&path, "%s%s%s", gw_trans->repo_folder ? gw_trans->repo_folder : "", blob - 3adf5f3dbc4de118965bdc9066822242aff95942 blob + e5ebc4d0a23cdad02ce0996c736d469f703ae9f8 --- include/got_object.h +++ include/got_object.h @@ -277,7 +277,7 @@ void got_object_blob_rewind(struct got_blob_object *); * file in the int argument, and line offsets in the off_t argument * (NULL can be passed for any output argument). */ -const struct got_error *got_object_blob_dump_to_file(size_t *, int *, +const struct got_error *got_object_blob_dump_to_file(off_t *, int *, off_t **, FILE *, struct got_blob_object *); /* blob - 6d0ab279e0da6c13e651b072c3cc470271db4145 blob + 5cfa91f7d83bf80cd3f5d756a2e165d747f4a994 --- lib/blame.c +++ lib/blame.c @@ -54,7 +54,7 @@ struct got_blame { FILE *f; off_t size; struct diff_config *cfg; - size_t filesize; + off_t filesize; int nlines; int nannotated; struct got_blame_line *lines; /* one per line */ @@ -162,7 +162,7 @@ blame_commit(struct got_blame *blame, struct got_objec struct got_blob_object *blob = NULL, *pblob = NULL; struct got_diffreg_result *diffreg_result = NULL; FILE *f1 = NULL, *f2 = NULL; - size_t size1, size2; + off_t size1, size2; int nlines1, nlines2; int *linemap1 = NULL; blob - 344e936b1376a8061425877f4af93d0c4a04e4cb blob + ea5a062582dfdef7e226c7887f98793fe2ed038a --- lib/diff.c +++ lib/diff.c @@ -65,7 +65,7 @@ diff_blobs(off_t **line_offsets, size_t *nlines, char hex1[SHA1_DIGEST_STRING_LENGTH]; char hex2[SHA1_DIGEST_STRING_LENGTH]; char *idstr1 = NULL, *idstr2 = NULL; - size_t size1, size2; + off_t size1, size2; struct got_diffreg_result *result; off_t outoff = 0; int n; @@ -222,7 +222,7 @@ diff_blob_file(struct got_diffreg_result **resultp, FILE *f1 = NULL; char hex1[SHA1_DIGEST_STRING_LENGTH]; char *idstr1 = NULL; - size_t size1; + off_t size1; struct got_diffreg_result *result = NULL; if (resultp) blob - b88554667888b99b82673683673307ae8c631fa6 blob + 7c0aac05143e35448209231ec4347e3ad6e2252b --- lib/object.c +++ lib/object.c @@ -1274,7 +1274,7 @@ got_object_blob_read_block(size_t *outlenp, struct got } const struct got_error * -got_object_blob_dump_to_file(size_t *filesize, int *nlines, +got_object_blob_dump_to_file(off_t *filesize, int *nlines, off_t **line_offsets, FILE *outfile, struct got_blob_object *blob) { const struct got_error *err = NULL; blob - ed5c1bcd6b0bf2c051b4462a2c75b7a3ed9ee102 blob + 54c37e9784d2d00193462315edb6f7cfc5bd6479 --- tog/tog.c +++ tog/tog.c @@ -333,7 +333,7 @@ struct tog_blame_thread_args { struct tog_blame { FILE *f; - size_t filesize; + off_t filesize; struct tog_blame_line *lines; int nlines; off_t *line_offsets;