commit 24a4d8019b7b2937f03fc86f47048f599ec6617c from: Omar Polo date: Tue May 16 17:34:05 2023 UTC rename got_gotweb_flushfile -> got_gotweb_closefile suggested and ok millert@ commit - 08ea2d1b208deaafa404f05069a578e4c58a9a6d commit + 24a4d8019b7b2937f03fc86f47048f599ec6617c blob - 044b02875ab1742a706a4d1967f1b02e2931d346 blob + ffea25d3cd3c9a40e3e30a28596301817a43a610 --- gotwebd/got_operations.c +++ gotwebd/got_operations.c @@ -53,7 +53,7 @@ static const struct got_error *got_gotweb_blame_cb(voi struct got_commit_object *,struct got_object_id *); const struct got_error * -got_gotweb_flushfile(FILE *f) +got_gotweb_closefile(FILE *f) { const struct got_error *err = NULL; @@ -1127,17 +1127,17 @@ done: if (fd2 != -1 && close(fd2) == -1 && error == NULL) error = got_error_from_errno("close"); if (bca.f) { - const struct got_error *bca_err = got_gotweb_flushfile(bca.f); + const struct got_error *bca_err = got_gotweb_closefile(bca.f); if (error == NULL) error = bca_err; } if (f1) { - const struct got_error *f1_err = got_gotweb_flushfile(f1); + const struct got_error *f1_err = got_gotweb_closefile(f1); if (error == NULL) error = f1_err; } if (f2) { - const struct got_error *f2_err = got_gotweb_flushfile(f2); + const struct got_error *f2_err = got_gotweb_closefile(f2); if (error == NULL) error = f2_err; } @@ -1254,17 +1254,17 @@ done: if (fd2 != -1 && close(fd2) == -1 && error == NULL) error = got_error_from_errno("close"); if (f1) { - const struct got_error *f1_err = got_gotweb_flushfile(f1); + const struct got_error *f1_err = got_gotweb_closefile(f1); if (error == NULL) error = f1_err; } if (f2) { - const struct got_error *f2_err = got_gotweb_flushfile(f2); + const struct got_error *f2_err = got_gotweb_closefile(f2); if (error == NULL) error = f2_err; } if (error && f3) { - got_gotweb_flushfile(f3); + got_gotweb_closefile(f3); *fp = NULL; } got_ref_list_free(&refs); blob - b6d0cc835948d84bab46566884f83f5ffb33f43b blob + a8c1e1b49284275b1bea48ee9de37357b94a5d91 --- gotwebd/gotweb.c +++ gotwebd/gotweb.c @@ -743,9 +743,9 @@ gotweb_free_transport(struct transport *t) if (t->blob) got_object_blob_close(t->blob); if (t->fp) { - err = got_gotweb_flushfile(t->fp); + err = got_gotweb_closefile(t->fp); if (err) - log_warnx("%s: got_gotweb_flushfile failure: %s", + log_warnx("%s: got_gotweb_closefile failure: %s", __func__, err->msg); } if (t->fd != -1 && close(t->fd) == -1) blob - 56d5af6cb41cbb9f36d922d1044540bccdefe980 blob + 5f1937de876a13a490b2ddb66ec7530a57bf47ad --- gotwebd/gotwebd.h +++ gotwebd/gotwebd.h @@ -506,7 +506,7 @@ int fcgi_printf(struct request *, const char *, ...) int fcgi_gen_binary_response(struct request *, const uint8_t *, int); /* got_operations.c */ -const struct got_error *got_gotweb_flushfile(FILE *); +const struct got_error *got_gotweb_closefile(FILE *); const struct got_error *got_get_repo_owner(char **, struct request *); const struct got_error *got_get_repo_age(time_t *, struct request *, const char *);