commit cb7c1b68b55c0be52aab11fd9382a711dbf72d6c from: Stefan Sperling date: Wed Nov 18 16:14:30 2020 UTC remove unused function got_diff_blob_prepared_file() commit - 72254787333eeb9d226c5341bbfee1b48c1c0f30 commit + cb7c1b68b55c0be52aab11fd9382a711dbf72d6c blob - 845c023388414d92a90603c95d5cc8f070cdf23b blob + 344e936b1376a8061425877f4af93d0c4a04e4cb --- lib/diff.c +++ lib/diff.c @@ -281,66 +281,6 @@ got_diff_blob_file(struct got_blob_object *blob1, cons { return diff_blob_file(NULL, blob1, label1, f2, size2, label2, diff_context, ignore_whitespace, outfile); -} - -const struct got_error * -got_diff_blob_prepared_file(struct got_diffreg_result **resultp, - struct diff_data *data1, struct got_blob_object *blob1, - struct diff_data *data2, FILE *f2, char *p2, size_t size2, - const struct diff_config *cfg, int ignore_whitespace) -{ - const struct got_error *err = NULL, *free_err; - FILE *f1 = NULL; - char hex1[SHA1_DIGEST_STRING_LENGTH]; - char *idstr1 = NULL, *p1 = NULL; - size_t size1, size; - struct got_diffreg_result *result = NULL; - int f1_created = 0; - - *resultp = NULL; - - size1 = 0; - if (blob1) { - f1 = got_opentemp(); - if (f1 == NULL) - return got_error_from_errno("got_opentemp"); - idstr1 = got_object_blob_id_str(blob1, hex1, sizeof(hex1)); - err = got_object_blob_dump_to_file(&size1, NULL, NULL, f1, - blob1); - if (err) - goto done; - } else { - idstr1 = "/dev/null"; - f1_created = 1; - f1 = got_opentemp(); - if (f1 == NULL) { - err = got_error_from_errno("got_opentemp"); - goto done; - } - } - - err = got_diff_prepare_file(f1, &p1, &size, data1, cfg, - ignore_whitespace); - if (err) - goto done; - - err = got_diffreg_prepared_files(&result, cfg, data1, f1, - p1, size1, data2, f2, p2, size2); - if (err) - goto done; - - *resultp = result; -done: - if (err) { - if (result) - free_err = got_diffreg_result_free_left(result); - else - free_err = got_diffreg_close(f1, p1, size1, NULL, - NULL, 0); - if (free_err && err == NULL) - err = free_err; - } - return err; } static const struct got_error * blob - f78de6a872b9a4f3b8c187da196913eea1817653 blob + a9b46222a6f67ccd16b7c3e51b169cc400c52324 --- lib/got_lib_diff.h +++ lib/got_lib_diff.h @@ -51,10 +51,6 @@ const struct got_error *got_diff_prepare_file(FILE *, const struct got_error *got_diffreg_prepared_files(struct got_diffreg_result **, const struct diff_config *, struct diff_data *, FILE *, char *, size_t, struct diff_data *, FILE *, char *, size_t); -const struct got_error *got_diff_blob_prepared_file( - struct got_diffreg_result **, struct diff_data *, struct got_blob_object *, - struct diff_data *, FILE *, char *, size_t, const struct diff_config *, - int); const struct got_error *got_diffreg(struct got_diffreg_result **, FILE *, FILE *, enum got_diff_algorithm, int); const struct got_error *got_diffreg_output(off_t **, size_t *,