commit 6fcac4576a437f60e050eec706040bdb272eb058 from: Stefan Sperling date: Mon Nov 19 09:05:28 2018 UTC store number of lines in int instead of size_t commit - f2e233d8c9ef56f29adca985325cc9696f7b4fb6 commit + 6fcac4576a437f60e050eec706040bdb272eb058 blob - c24e7e0fd473d1327a88bc5c25fd0ed0963c815e blob + 4381cdf163f126acf727fe4d81e16d5f4c0ae0d7 --- include/got_object.h +++ include/got_object.h @@ -218,11 +218,10 @@ const struct got_error *got_object_blob_read_block(siz /* * Read the entire content of a blob and write it to the specified file. * Flush and rewind the file as well. Indicate the amount of bytes - * written in the first size_t output argument, and the number of lines - * in the file in the second size_t output argument (NULL can be passed - * for either output argument). + * written in the size_t output argument, and the number of lines in + * the file in int argument (NULL can be passed for either output argument). */ -const struct got_error *got_object_blob_dump_to_file(size_t *, size_t *, +const struct got_error *got_object_blob_dump_to_file(size_t *, int *, FILE *, struct got_blob_object *); /* blob - ea25dfb919bc7fbff98d575ecbbab2c14831aae5 blob + e32dd4a6f55ae4f90e82a25f0190eb98da4c65ad --- lib/blame.c +++ lib/blame.c @@ -52,7 +52,7 @@ SLIST_HEAD(got_blame_diff_offsets_list, got_blame_diff struct got_blame { FILE *f; - size_t nlines; + int nlines; struct got_blame_line *lines; /* one per line */ int ncommits; struct got_blame_diff_offsets_list diff_offsets_list; blob - 0826de56f5685ef06c7e6af20bfcfc6cce2953bb blob + d8eaa0694dfff1236a766498a23852ee8d234ee3 --- lib/object.c +++ lib/object.c @@ -662,7 +662,7 @@ got_object_blob_read_block(size_t *outlenp, struct got } const struct got_error * -got_object_blob_dump_to_file(size_t *total_len, size_t *nlines, +got_object_blob_dump_to_file(size_t *total_len, int *nlines, FILE *outfile, struct got_blob_object *blob) { const struct got_error *err = NULL; blob - 571b5abeb025395b00bc37c3511d608b549a4ca7 blob + a450bfd079d162b30d44110c6e87655fb9429bd5 --- tog/tog.c +++ tog/tog.c @@ -169,7 +169,7 @@ struct tog_blame { FILE *f; size_t filesize; struct tog_blame_line *lines; - size_t nlines; + int nlines; pthread_t thread; struct tog_blame_thread_args thread_args; struct tog_blame_cb_args cb_args;