commit 24e87ea36353362f676afa722d0b7361a7223cbc from: Stefan Sperling date: Wed Nov 18 16:15:41 2020 UTC remove unused function got_diffreg_prepared_files() commit - cb7c1b68b55c0be52aab11fd9382a711dbf72d6c commit + 24e87ea36353362f676afa722d0b7361a7223cbc blob - f986eb1b1518f1d74f60a7bf8f8fbedaec2e678f blob + 8dbab6f2166e74d05f55fa057f00e1e8602740fc --- lib/diffreg.c +++ lib/diffreg.c @@ -157,47 +157,6 @@ done: } const struct got_error * -got_diffreg_prepared_files(struct got_diffreg_result **diffreg_result, - const struct diff_config *cfg, - struct diff_data *left, FILE *f1, char *p1, size_t size1, - struct diff_data *right, FILE *f2, char *p2, size_t size2) -{ - const struct got_error *err = NULL; - struct diff_result *diff_result; - - *diffreg_result = calloc(1, sizeof(**diffreg_result)); - if (*diffreg_result == NULL) - return got_error_from_errno("calloc"); - - diff_result = diff_main(cfg, left, right); - if (diff_result == NULL) { - err = got_error_set_errno(ENOMEM, "malloc"); - goto done; - } - if (diff_result->rc != DIFF_RC_OK) { - err = got_error_set_errno(diff_result->rc, "diff"); - goto done; - } - - (*diffreg_result)->result = diff_result; - (*diffreg_result)->f1 = f1; - (*diffreg_result)->map1 = p1; - (*diffreg_result)->size1 = size1; - (*diffreg_result)->f2 = f2; - (*diffreg_result)->map2 = p2; - (*diffreg_result)->size2 = size2; -done: - if (err) { - if (diffreg_result) { - free(*diffreg_result); - *diffreg_result = NULL; - } - } - - return err; -} - -const struct got_error * got_diffreg(struct got_diffreg_result **diffreg_result, FILE *f1, FILE *f2, enum got_diff_algorithm algorithm, int ignore_whitespace) { blob - a9b46222a6f67ccd16b7c3e51b169cc400c52324 blob + 569cb201c391ea456cd142edbaf9f85ae5d91ba7 --- lib/got_lib_diff.h +++ lib/got_lib_diff.h @@ -48,9 +48,6 @@ struct got_diffreg_result { const struct diff_config *got_diff_get_config(enum got_diff_algorithm); const struct got_error *got_diff_prepare_file(FILE *, char **, size_t *, struct diff_data *, const struct diff_config *, int); -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_diffreg(struct got_diffreg_result **, FILE *, FILE *, enum got_diff_algorithm, int); const struct got_error *got_diffreg_output(off_t **, size_t *,