commit d00235d81cec70db37ca306ea1db137a5464982e from: Omar Polo via: Thomas Adam date: Wed May 17 15:49:55 2023 UTC rename got_gotweb_flushfile -> got_gotweb_closefile suggested and ok millert@ commit - 985ec13bc7dc1bc1885d8111e51ea98c619d0d4e commit + d00235d81cec70db37ca306ea1db137a5464982e blob - c4a36be92dece1c2aefe0758c42d4da768abf4fa blob + dc3cb36672a916a182e6a7c9d4c78e3605e600eb --- 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 - ef7ceaf270c0444fb679c71ba595ea9bb7c02a91 blob + e61d0fe945666875ad913c3ef3a61a2e50b72a06 --- gotwebd/gotweb.c +++ gotwebd/gotweb.c @@ -742,9 +742,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 - 6143eaf2f67efd948d7df9e1ce6ed0c28f584cce blob + 358100421a640da24ee6f5d6182c3ebe61ad1a2f --- gotwebd/gotwebd.h +++ gotwebd/gotwebd.h @@ -508,7 +508,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 *);