mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bundle-uri: use plain string in find_temp_filename()

Browse Source 
The find_temp_filename() method was created in 53a50892be (bundle-uri:
create basic file-copy logic, 2022-08-09) and uses odb_mkstemp() to
create a temporary filename. The odb_mkstemp() method uses a strbuf in
its interface, but we do not need to continue carrying a strbuf
throughout the bundle URI code.

Convert the find_temp_filename() method to use a 'char *' and modify its
only caller. This makes sense that we don't actually need to modify this
filename directly later, so using a strbuf is overkill.

This change will simplify the data structure for tracking a bundle list
to use plain strings instead of strbufs.

Signed-off-by: Derrick Stolee <derrickstolee@github.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Derrick Stolee
2022-10-12 12:52:28 +00:00
committed by Junio C Hamano
parent f677f62970
commit 23b6d00ba7
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
bundle-uri.c
View File

@ -5,22 +5,23 @@
#include "refs.h" #include "refs.h"
#include "run-command.h" #include "run-command.h"
static int find_temp_filename(struct strbuf *name) static char *find_temp_filename(void)
{ {
int fd; int fd;
struct strbuf name = STRBUF_INIT;
/* /*
* Find a temporary filename that is available. This is briefly * Find a temporary filename that is available. This is briefly
* racy, but unlikely to collide. * racy, but unlikely to collide.
*/ */
fd = odb_mkstemp(name, "bundles/tmp_uri_XXXXXX"); fd = odb_mkstemp(&name, "bundles/tmp_uri_XXXXXX");
if (fd < 0) { if (fd < 0) {
warning(_("failed to create temporary file")); warning(_("failed to create temporary file"));
return -1; return NULL;
} }
close(fd); close(fd);
unlink(name->buf); unlink(name.buf);
return 0; return strbuf_detach(&name, NULL);
} }
static int download_https_uri_to_file(const char *file, const char *uri) static int download_https_uri_to_file(const char *file, const char *uri)
@ -141,28 +142,31 @@ static int unbundle_from_file(struct repository *r, const char *file)
int fetch_bundle_uri(struct repository *r, const char *uri) int fetch_bundle_uri(struct repository *r, const char *uri)
{ {
int result = 0; int result = 0;
struct strbuf filename = STRBUF_INIT; char *filename;
if ((result = find_temp_filename(&filename))) if (!(filename = find_temp_filename())) {
result = -1;
goto cleanup; goto cleanup;
}
if ((result = copy_uri_to_file(filename.buf, uri))) { if ((result = copy_uri_to_file(filename, uri))) {
warning(_("failed to download bundle from URI '%s'"), uri); warning(_("failed to download bundle from URI '%s'"), uri);
goto cleanup; goto cleanup;
} }
if ((result = !is_bundle(filename.buf, 0))) { if ((result = !is_bundle(filename, 0))) {
warning(_("file at URI '%s' is not a bundle"), uri); warning(_("file at URI '%s' is not a bundle"), uri);
goto cleanup; goto cleanup;
} }
if ((result = unbundle_from_file(r, filename.buf))) { if ((result = unbundle_from_file(r, filename))) {
warning(_("failed to unbundle bundle from URI '%s'"), uri); warning(_("failed to unbundle bundle from URI '%s'"), uri);
goto cleanup; goto cleanup;
} }
cleanup: cleanup:
unlink(filename.buf); if (filename)
strbuf_release(&filename); unlink(filename);
free(filename);
return result; return result;
} }