Commit f0f3a18af66cd1d09b407748e6db0ab3707778bf
2012-02-20T19:42:27
Move git_remote_load() to git_buf
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86
diff --git a/src/remote.c b/src/remote.c
index d4caf02..993037e 100644
--- a/src/remote.c
+++ b/src/remote.c
@@ -96,9 +96,9 @@ int git_remote_new(git_remote **out, git_repository *repo, const char *url, cons
int git_remote_load(git_remote **out, git_repository *repo, const char *name)
{
git_remote *remote;
- char *buf = NULL;
+ git_buf buf = GIT_BUF_INIT;
const char *val;
- int ret, error, buf_len;
+ int error;
git_config *config;
assert(out && repo && name);
@@ -123,21 +123,13 @@ int git_remote_load(git_remote **out, git_repository *repo, const char *name)
goto cleanup;
}
- /* "fetch" is the longest var name we're interested in */
- buf_len = strlen("remote.") + strlen(".fetch") + strlen(name) + 1;
- buf = git__malloc(buf_len);
- if (buf == NULL) {
+ git_buf_printf(&buf, "remote.%s.url", name);
+ if (git_buf_oom(&buf)) {
error = GIT_ENOMEM;
goto cleanup;
}
- ret = p_snprintf(buf, buf_len, "%s.%s.%s", "remote", name, "url");
- if (ret < 0) {
- error = git__throw(GIT_EOSERR, "Failed to build config var name");
- goto cleanup;
- }
-
- error = git_config_get_string(config, buf, &val);
+ error = git_config_get_string(config, git_buf_cstr(&buf), &val);
if (error < GIT_SUCCESS) {
error = git__rethrow(error, "Remote's url doesn't exist");
goto cleanup;
@@ -150,25 +142,27 @@ int git_remote_load(git_remote **out, git_repository *repo, const char *name)
goto cleanup;
}
- ret = p_snprintf(buf, buf_len, "%s.%s.%s", "remote", name, "fetch");
- if (ret < 0) {
- error = git__throw(GIT_EOSERR, "Failed to build config var name");
+ git_buf_clear(&buf);
+ git_buf_printf(&buf, "remote.%s.fetch", name);
+ if (git_buf_oom(&buf)) {
+ error = GIT_ENOMEM;
goto cleanup;
}
- error = parse_remote_refspec(config, &remote->fetch, buf);
+ error = parse_remote_refspec(config, &remote->fetch, git_buf_cstr(&buf));
if (error < GIT_SUCCESS) {
error = git__rethrow(error, "Failed to get fetch refspec");
goto cleanup;
}
- ret = p_snprintf(buf, buf_len, "%s.%s.%s", "remote", name, "push");
- if (ret < 0) {
- error = git__throw(GIT_EOSERR, "Failed to build config var name");
+ git_buf_clear(&buf);
+ git_buf_printf(&buf, "remote.%s.push", name);
+ if (git_buf_oom(&buf)) {
+ error = GIT_ENOMEM;
goto cleanup;
}
- error = parse_remote_refspec(config, &remote->push, buf);
+ error = parse_remote_refspec(config, &remote->push, git_buf_cstr(&buf));
/* Not finding push is fine */
if (error == GIT_ENOTFOUND)
error = GIT_SUCCESS;
@@ -179,7 +173,7 @@ int git_remote_load(git_remote **out, git_repository *repo, const char *name)
*out = remote;
cleanup:
- git__free(buf);
+ git_buf_free(&buf);
if (error < GIT_SUCCESS)
git_remote_free(remote);