diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/attr.c | 12 | ||||
| -rw-r--r-- | src/branch.c | 2 | ||||
| -rw-r--r-- | src/config.c | 72 | ||||
| -rw-r--r-- | src/config_cache.c | 10 | ||||
| -rw-r--r-- | src/crlf.c | 10 | ||||
| -rw-r--r-- | src/delta-apply.c | 2 | ||||
| -rw-r--r-- | src/delta-apply.h | 2 | ||||
| -rw-r--r-- | src/diff.c | 4 | ||||
| -rw-r--r-- | src/diff_output.c | 2 | ||||
| -rw-r--r-- | src/fetch.c | 2 | ||||
| -rw-r--r-- | src/filter.c | 4 | ||||
| -rw-r--r-- | src/filter.h | 2 | ||||
| -rw-r--r-- | src/indexer.c | 8 | ||||
| -rw-r--r-- | src/notes.c | 2 | ||||
| -rw-r--r-- | src/object.c | 6 | ||||
| -rw-r--r-- | src/odb.c | 12 | ||||
| -rw-r--r-- | src/pack.c | 12 | ||||
| -rw-r--r-- | src/pkt.c | 4 | ||||
| -rw-r--r-- | src/protocol.c | 2 | ||||
| -rw-r--r-- | src/refs.c | 8 | ||||
| -rw-r--r-- | src/refspec.c | 4 | ||||
| -rw-r--r-- | src/refspec.h | 2 | ||||
| -rw-r--r-- | src/remote.c | 6 | ||||
| -rw-r--r-- | src/repository.c | 15 | ||||
| -rw-r--r-- | src/revwalk.c | 20 | ||||
| -rw-r--r-- | src/signature.c | 4 | ||||
| -rw-r--r-- | src/submodule.c | 5 | ||||
| -rw-r--r-- | src/tag.c | 10 | ||||
| -rw-r--r-- | src/transport.c | 6 | ||||
| -rw-r--r-- | src/transports/git.c | 10 | ||||
| -rw-r--r-- | src/transports/http.c | 6 | ||||
| -rw-r--r-- | src/transports/local.c | 2 | ||||
| -rw-r--r-- | src/tree.c | 6 | ||||
| -rw-r--r-- | src/util.c | 24 | ||||
| -rw-r--r-- | src/util.h | 9 |
35 files changed, 164 insertions, 143 deletions
diff --git a/src/attr.c b/src/attr.c index 1aa965de3..093f64d5c 100644 --- a/src/attr.c +++ b/src/attr.c @@ -13,11 +13,11 @@ static int collect_attr_files( int git_attr_get( + const char **value, git_repository *repo, uint32_t flags, const char *pathname, - const char *name, - const char **value) + const char *name) { int error; git_attr_path path; @@ -64,12 +64,12 @@ typedef struct { } attr_get_many_info; int git_attr_get_many( + const char **values, git_repository *repo, uint32_t flags, const char *pathname, size_t num_attr, - const char **names, - const char **values) + const char **names) { int error; git_attr_path path; @@ -576,11 +576,11 @@ int git_attr_cache__init(git_repository *repo) if (git_repository_config__weakptr(&cfg, repo) < 0) return -1; - ret = git_config_get_string(cfg, GIT_ATTR_CONFIG, &cache->cfg_attr_file); + ret = git_config_get_string(&cache->cfg_attr_file, cfg, GIT_ATTR_CONFIG); if (ret < 0 && ret != GIT_ENOTFOUND) return ret; - ret = git_config_get_string(cfg, GIT_IGNORE_CONFIG, &cache->cfg_excl_file); + ret = git_config_get_string(&cache->cfg_excl_file, cfg, GIT_IGNORE_CONFIG); if (ret < 0 && ret != GIT_ENOTFOUND) return ret; diff --git a/src/branch.c b/src/branch.c index 881e749a8..5d5a24038 100644 --- a/src/branch.c +++ b/src/branch.c @@ -105,7 +105,7 @@ cleanup: return error; } -int git_branch_delete(git_repository *repo, const char *branch_name, git_branch_type branch_type) +int git_branch_delete(git_repository *repo, const char *branch_name, git_branch_t branch_type) { git_reference *branch = NULL; git_reference *head = NULL; diff --git a/src/config.c b/src/config.c index 0ab0cd424..618202c34 100644 --- a/src/config.c +++ b/src/config.c @@ -199,30 +199,6 @@ int git_config_set_string(git_config *cfg, const char *name, const char *value) return file->set(file, name, value); } -int git_config_parse_bool(int *out, const char *value) -{ - /* A missing value means true */ - if (value == NULL) { - *out = 1; - return 0; - } - - if (!strcasecmp(value, "true") || - !strcasecmp(value, "yes") || - !strcasecmp(value, "on")) { - *out = 1; - return 0; - } - if (!strcasecmp(value, "false") || - !strcasecmp(value, "no") || - !strcasecmp(value, "off")) { - *out = 0; - return 0; - } - - return -1; -} - static int parse_int64(int64_t *out, const char *value) { const char *num_end; @@ -297,7 +273,7 @@ int git_config_lookup_map_value( case GIT_CVAR_TRUE: { int bool_val; - if (git_config_parse_bool(&bool_val, value) == 0 && + if (git__parse_bool(&bool_val, value) == 0 && bool_val == (int)m->cvar_type) { *out = m->map_value; return 0; @@ -322,12 +298,17 @@ int git_config_lookup_map_value( return GIT_ENOTFOUND; } -int git_config_get_mapped(git_config *cfg, const char *name, git_cvar_map *maps, size_t map_n, int *out) +int git_config_get_mapped( + int *out, + git_config *cfg, + const char *name, + git_cvar_map *maps, + size_t map_n) { const char *value; int ret; - ret = git_config_get_string(cfg, name, &value); + ret = git_config_get_string(&value, cfg, name); if (ret < 0) return ret; @@ -339,12 +320,12 @@ int git_config_get_mapped(git_config *cfg, const char *name, git_cvar_map *maps, return -1; } -int git_config_get_int64(git_config *cfg, const char *name, int64_t *out) +int git_config_get_int64(int64_t *out, git_config *cfg, const char *name) { const char *value; int ret; - ret = git_config_get_string(cfg, name, &value); + ret = git_config_get_string(&value, cfg, name); if (ret < 0) return ret; @@ -356,12 +337,12 @@ int git_config_get_int64(git_config *cfg, const char *name, int64_t *out) return 0; } -int git_config_get_int32(git_config *cfg, const char *name, int32_t *out) +int git_config_get_int32(int32_t *out, git_config *cfg, const char *name) { const char *value; int ret; - ret = git_config_get_string(cfg, name, &value); + ret = git_config_get_string(&value, cfg, name); if (ret < 0) return ret; @@ -373,16 +354,16 @@ int git_config_get_int32(git_config *cfg, const char *name, int32_t *out) return 0; } -int git_config_get_bool(git_config *cfg, const char *name, int *out) +int git_config_get_bool(int *out, git_config *cfg, const char *name) { const char *value; int ret; - ret = git_config_get_string(cfg, name, &value); + ret = git_config_get_string(&value, cfg, name); if (ret < 0) return ret; - if (git_config_parse_bool(out, value) == 0) + if (git__parse_bool(out, value) == 0) return 0; if (parse_int32(out, value) == 0) { @@ -394,7 +375,7 @@ int git_config_get_bool(git_config *cfg, const char *name, int *out) return -1; } -int git_config_get_string(git_config *cfg, const char *name, const char **out) +int git_config_get_string(const char **out, git_config *cfg, const char *name) { file_internal *internal; unsigned int i; @@ -462,7 +443,7 @@ int git_config_find_global_r(git_buf *path) return git_futils_find_global_file(path, GIT_CONFIG_FILENAME); } -int git_config_find_global(char *global_config_path) +int git_config_find_global(char *global_config_path, size_t length) { git_buf path = GIT_BUF_INIT; int ret = git_config_find_global_r(&path); @@ -472,14 +453,14 @@ int git_config_find_global(char *global_config_path) return ret; } - if (path.size > GIT_PATH_MAX) { + if (path.size >= length) { git_buf_free(&path); giterr_set(GITERR_NOMEMORY, "Path is to long to fit on the given buffer"); return -1; } - git_buf_copy_cstr(global_config_path, GIT_PATH_MAX, &path); + git_buf_copy_cstr(global_config_path, length, &path); git_buf_free(&path); return 0; } @@ -489,7 +470,7 @@ int git_config_find_system_r(git_buf *path) return git_futils_find_system_file(path, GIT_CONFIG_FILENAME_SYSTEM); } -int git_config_find_system(char *system_config_path) +int git_config_find_system(char *system_config_path, size_t length) { git_buf path = GIT_BUF_INIT; int ret = git_config_find_system_r(&path); @@ -499,14 +480,14 @@ int git_config_find_system(char *system_config_path) return ret; } - if (path.size > GIT_PATH_MAX) { + if (path.size >= length) { git_buf_free(&path); giterr_set(GITERR_NOMEMORY, "Path is to long to fit on the given buffer"); return -1; } - git_buf_copy_cstr(system_config_path, GIT_PATH_MAX, &path); + git_buf_copy_cstr(system_config_path, length, &path); git_buf_free(&path); return 0; } @@ -514,11 +495,14 @@ int git_config_find_system(char *system_config_path) int git_config_open_global(git_config **out) { int error; - char global_path[GIT_PATH_MAX]; + git_buf path = GIT_BUF_INIT; - if ((error = git_config_find_global(global_path)) < 0) + if ((error = git_config_find_global_r(&path)) < 0) return error; - return git_config_open_ondisk(out, global_path); + error = git_config_open_ondisk(out, git_buf_cstr(&path)); + git_buf_free(&path); + + return error; } diff --git a/src/config_cache.c b/src/config_cache.c index 3679a9646..ca9602e56 100644 --- a/src/config_cache.c +++ b/src/config_cache.c @@ -66,22 +66,22 @@ int git_repository__cvar(int *out, git_repository *repo, git_cvar_cached cvar) int error; error = git_repository_config__weakptr(&config, repo); - if (error < GIT_SUCCESS) + if (error < 0) return error; - error = git_config_get_mapped( - config, data->cvar_name, data->maps, data->map_count, out); + error = git_config_get_mapped(out, + config, data->cvar_name, data->maps, data->map_count); if (error == GIT_ENOTFOUND) *out = data->default_value; - else if (error < GIT_SUCCESS) + else if (error < 0) return error; repo->cvar_cache[(int)cvar] = *out; } - return GIT_SUCCESS; + return 0; } void git_repository__cvar_cache_clear(git_repository *repo) diff --git a/src/crlf.c b/src/crlf.c index 5d09a1f40..303a46d3b 100644 --- a/src/crlf.c +++ b/src/crlf.c @@ -82,8 +82,8 @@ static int crlf_load_attributes(struct crlf_attrs *ca, git_repository *repo, con const char *attr_vals[NUM_CONV_ATTRS]; int error; - error = git_attr_get_many( - repo, 0, path, NUM_CONV_ATTRS, attr_names, attr_vals); + error = git_attr_get_many(attr_vals, + repo, 0, path, NUM_CONV_ATTRS, attr_names); if (error == GIT_ENOTFOUND) { ca->crlf_action = GIT_CRLF_GUESS; @@ -91,7 +91,7 @@ static int crlf_load_attributes(struct crlf_attrs *ca, git_repository *repo, con return 0; } - if (error == GIT_SUCCESS) { + if (error == 0) { ca->crlf_action = check_crlf(attr_vals[2]); /* text */ if (ca->crlf_action == GIT_CRLF_GUESS) ca->crlf_action = check_crlf(attr_vals[0]); /* clrf */ @@ -100,7 +100,7 @@ static int crlf_load_attributes(struct crlf_attrs *ca, git_repository *repo, con return 0; } - return error; + return -1; } static int drop_crlf(git_buf *dest, const git_buf *source) @@ -207,7 +207,7 @@ int git_filter_add__crlf_to_odb(git_vector *filters, git_repository *repo, const int auto_crlf; if ((error = git_repository__cvar( - &auto_crlf, repo, GIT_CVAR_AUTO_CRLF)) < GIT_SUCCESS) + &auto_crlf, repo, GIT_CVAR_AUTO_CRLF)) < 0) return error; if (auto_crlf == GIT_AUTO_CRLF_FALSE) diff --git a/src/delta-apply.c b/src/delta-apply.c index d3be084e0..815ca8f16 100644 --- a/src/delta-apply.c +++ b/src/delta-apply.c @@ -111,7 +111,7 @@ int git__delta_apply( if (delta != delta_end || res_sz) goto fail; - return GIT_SUCCESS; + return 0; fail: git__free(out->data); diff --git a/src/delta-apply.h b/src/delta-apply.h index e46ef9af4..66fa76d43 100644 --- a/src/delta-apply.h +++ b/src/delta-apply.h @@ -20,7 +20,7 @@ * @param delta the delta to execute copy/insert instructions from. * @param delta_len total number of bytes in the delta. * @return - * - GIT_SUCCESS on a successful delta unpack. + * - 0 on a successful delta unpack. * - GIT_ERROR if the delta is corrupt or doesn't match the base. */ extern int git__delta_apply( diff --git a/src/diff.c b/src/diff.c index d5c0c8ba5..0b2f8fb50 100644 --- a/src/diff.c +++ b/src/diff.c @@ -270,8 +270,10 @@ static int diff_delta__cmp(const void *a, const void *b) static int config_bool(git_config *cfg, const char *name, int defvalue) { int val = defvalue; - if (git_config_get_bool(cfg, name, &val) < 0) + + if (git_config_get_bool(&val, cfg, name) < 0) giterr_clear(); + return val; } diff --git a/src/diff_output.c b/src/diff_output.c index 4ad736e26..ba7ef8245 100644 --- a/src/diff_output.c +++ b/src/diff_output.c @@ -103,7 +103,7 @@ static int diff_output_cb(void *priv, mmbuffer_t *bufs, int len) static int update_file_is_binary_by_attr(git_repository *repo, git_diff_file *file) { const char *value; - if (git_attr_get(repo, 0, file->path, "diff", &value) < 0) + if (git_attr_get(&value, repo, 0, file->path, "diff") < 0) return -1; if (GIT_ATTR_FALSE(value)) diff --git a/src/fetch.c b/src/fetch.c index 08c789ddb..c92cf4ef5 100644 --- a/src/fetch.c +++ b/src/fetch.c @@ -165,7 +165,7 @@ int git_fetch_setup_walk(git_revwalk **out, git_repository *repo) unsigned int i; git_reference *ref; - if (git_reference_listall(&refs, repo, GIT_REF_LISTALL) < 0) + if (git_reference_list(&refs, repo, GIT_REF_LISTALL) < 0) return -1; if (git_revwalk_new(&walk, repo) < 0) diff --git a/src/filter.c b/src/filter.c index 73fe83e61..8fa3eb684 100644 --- a/src/filter.c +++ b/src/filter.c @@ -129,7 +129,7 @@ int git_filters_apply(git_buf *dest, git_buf *source, git_vector *filters) if (git_buf_len(source) == 0) { git_buf_clear(dest); - return GIT_SUCCESS; + return 0; } /* Pre-grow the destination buffer to more or less the size @@ -160,6 +160,6 @@ int git_filters_apply(git_buf *dest, git_buf *source, git_vector *filters) if (src != 1) git_buf_swap(dest, source); - return GIT_SUCCESS; + return 0; } diff --git a/src/filter.h b/src/filter.h index 5a77f25c6..66e370aef 100644 --- a/src/filter.h +++ b/src/filter.h @@ -75,7 +75,7 @@ extern int git_filters_load(git_vector *filters, git_repository *repo, const cha * @param dest Buffer to store the result of the filtering * @param source Buffer containing the document to filter * @param filters A non-empty vector of filters as supplied by `git_filters_load` - * @return GIT_SUCCESS on success, an error code otherwise + * @return 0 on success, an error code otherwise */ extern int git_filters_apply(git_buf *dest, git_buf *source, git_vector *filters); diff --git a/src/indexer.c b/src/indexer.c index 01bec0877..6f735e651 100644 --- a/src/indexer.c +++ b/src/indexer.c @@ -205,9 +205,9 @@ static int store_delta(git_indexer_stream *idx) } error = packfile_unpack_compressed(&obj, idx->pack, &w, &idx->off, entry_size, type); - if (error == GIT_ESHORTBUFFER) { + if (error == GIT_EBUFS) { idx->off = entry_start; - return GIT_ESHORTBUFFER; + return GIT_EBUFS; } else if (error < 0){ return -1; } @@ -355,7 +355,7 @@ int git_indexer_stream_add(git_indexer_stream *idx, const void *data, size_t siz return 0; error = git_packfile_unpack(&obj, idx->pack, &idx->off); - if (error == GIT_ESHORTBUFFER) { + if (error == GIT_EBUFS) { idx->off = entry_start; return 0; } @@ -363,7 +363,7 @@ int git_indexer_stream_add(git_indexer_stream *idx, const void *data, size_t siz if (error < 0) { idx->off = entry_start; error = store_delta(idx); - if (error == GIT_ESHORTBUFFER) + if (error == GIT_EBUFS) return 0; if (error < 0) return error; diff --git a/src/notes.c b/src/notes.c index a86a75b01..84ad94087 100644 --- a/src/notes.c +++ b/src/notes.c @@ -274,7 +274,7 @@ static int note_get_default_ref(const char **out, git_repository *repo) if (git_repository_config__weakptr(&cfg, repo) < 0) return -1; - ret = git_config_get_string(cfg, "core.notesRef", out); + ret = git_config_get_string(out, cfg, "core.notesRef"); if (ret == GIT_ENOTFOUND) { *out = GIT_NOTES_DEFAULT_REF; return 0; diff --git a/src/object.c b/src/object.c index deeacb27c..d3673eda0 100644 --- a/src/object.c +++ b/src/object.c @@ -74,7 +74,7 @@ static int create_object(git_object **object_out, git_otype type) object->type = type; *object_out = object; - return GIT_SUCCESS; + return 0; } int git_object_lookup_prefix( @@ -87,7 +87,7 @@ int git_object_lookup_prefix( git_object *object = NULL; git_odb *odb = NULL; git_odb_object *odb_obj; - int error = GIT_SUCCESS; + int error = 0; assert(repo && object_out && id); @@ -95,7 +95,7 @@ int git_object_lookup_prefix( return GIT_EAMBIGUOUS; error = git_repository_odb__weakptr(&odb, repo); - if (error < GIT_SUCCESS) + if (error < 0) return error; if (len > GIT_OID_HEXSZ) @@ -505,7 +505,7 @@ int git_odb_read_header(size_t *len_p, git_otype *type_p, git_odb *db, const git error = b->read_header(len_p, type_p, b, id); } - if (!error || error == GIT_EPASSTHROUGH) + if (!error || error == GIT_PASSTHROUGH) return 0; /* @@ -545,7 +545,7 @@ int git_odb_read(git_odb_object **out, git_odb *db, const git_oid *id) * will never have called giterr_set(). */ - if (error && error != GIT_EPASSTHROUGH) + if (error && error != GIT_PASSTHROUGH) return error; *out = git_cache_try_store(&db->cache, new_odb_object(id, &raw)); @@ -582,7 +582,7 @@ int git_odb_read_prefix( if (b->read != NULL) { git_oid full_oid; error = b->read_prefix(&full_oid, &raw.data, &raw.len, &raw.type, b, short_id, len); - if (error == GIT_ENOTFOUND || error == GIT_EPASSTHROUGH) + if (error == GIT_ENOTFOUND || error == GIT_PASSTHROUGH) continue; if (error) @@ -623,7 +623,7 @@ int git_odb_write( error = b->write(oid, b, data, len, type); } - if (!error || error == GIT_EPASSTHROUGH) + if (!error || error == GIT_PASSTHROUGH) return 0; /* if no backends were able to write the object directly, we try a streaming @@ -662,7 +662,7 @@ int git_odb_open_wstream( error = init_fake_wstream(stream, b, size, type); } - if (error == GIT_EPASSTHROUGH) + if (error == GIT_PASSTHROUGH) error = 0; return error; @@ -683,7 +683,7 @@ int git_odb_open_rstream(git_odb_stream **stream, git_odb *db, const git_oid *oi error = b->readstream(stream, b, oid); } - if (error == GIT_EPASSTHROUGH) + if (error == GIT_PASSTHROUGH) error = 0; return error; diff --git a/src/pack.c b/src/pack.c index 4a6bc6ae8..0db1069de 100644 --- a/src/pack.c +++ b/src/pack.c @@ -222,7 +222,7 @@ static int packfile_unpack_header1( shift = 4; while (c & 0x80) { if (len <= used) - return GIT_ESHORTBUFFER; + return GIT_EBUFS; if (bitsizeof(long) <= shift) { *usedp = 0; @@ -260,11 +260,11 @@ int git_packfile_unpack_header( // base = pack_window_open(p, w_curs, *curpos, &left); base = git_mwindow_open(mwf, w_curs, *curpos, 20, &left); if (base == NULL) - return GIT_ESHORTBUFFER; + return GIT_EBUFS; ret = packfile_unpack_header1(&used, size_p, type_p, base, left); git_mwindow_close(w_curs); - if (ret == GIT_ESHORTBUFFER) + if (ret == GIT_EBUFS) return ret; else if (ret < 0) return packfile_error("header length is zero"); @@ -428,7 +428,7 @@ int packfile_unpack_compressed( if (st == Z_BUF_ERROR && in == NULL) { inflateEnd(&stream); git__free(buffer); - return GIT_ESHORTBUFFER; + return GIT_EBUFS; } *curpos += stream.next_in - in; @@ -467,7 +467,7 @@ git_off_t get_delta_base( base_info = pack_window_open(p, w_curs, *curpos, &left); /* Assumption: the only reason this would fail is because the file is too small */ if (base_info == NULL) - return GIT_ESHORTBUFFER; + return GIT_EBUFS; /* pack_window_open() assured us we have [base_info, base_info + 20) * as a range that we can look at without walking off the * end of the mapped window. Its actually the hash size @@ -480,7 +480,7 @@ git_off_t get_delta_base( base_offset = c & 127; while (c & 128) { if (left <= used) - return GIT_ESHORTBUFFER; + return GIT_EBUFS; base_offset += 1; if (!base_offset || MSB(base_offset, 7)) return 0; /* overflow */ @@ -208,7 +208,7 @@ int git_pkt_parse_line( /* Not even enough for the length */ if (bufflen > 0 && bufflen < PKT_LEN_SIZE) - return GIT_ESHORTBUFFER; + return GIT_EBUFS; len = parse_len(line); if (len < 0) { @@ -230,7 +230,7 @@ int git_pkt_parse_line( * enough in the buffer to satisfy this line */ if (bufflen > 0 && bufflen < (size_t)len) - return GIT_ESHORTBUFFER; + return GIT_EBUFS; line += PKT_LEN_SIZE; /* diff --git a/src/protocol.c b/src/protocol.c index a75354121..6b3861796 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -34,7 +34,7 @@ int git_protocol_store_refs(git_protocol *p, const char *data, size_t len) return 0; error = git_pkt_parse_line(&pkt, ptr, &line_end, git_buf_len(buf)); - if (error == GIT_ESHORTBUFFER) + if (error == GIT_EBUFS) return 0; /* Ask for more */ if (error < 0) return p->error = -1; diff --git a/src/refs.c b/src/refs.c index 28e8f786b..1ef3e13a4 100644 --- a/src/refs.c +++ b/src/refs.c @@ -194,10 +194,10 @@ corrupt: return -1; } -static git_rtype loose_guess_rtype(const git_buf *full_path) +static git_ref_t loose_guess_rtype(const git_buf *full_path) { git_buf ref_file = GIT_BUF_INIT; - git_rtype type; + git_ref_t type; type = GIT_REF_INVALID; @@ -1153,7 +1153,7 @@ int git_reference_lookup_resolved( /** * Getters */ -git_rtype git_reference_type(git_reference *ref) +git_ref_t git_reference_type(git_reference *ref) { assert(ref); @@ -1518,7 +1518,7 @@ static int cb__reflist_add(const char *ref, void *data) return git_vector_insert((git_vector *)data, git__strdup(ref)); } -int git_reference_listall( +int git_reference_list( git_strarray *array, git_repository *repo, unsigned int list_flags) diff --git a/src/refspec.c b/src/refspec.c index ee4d3a158..697b1bf87 100644 --- a/src/refspec.c +++ b/src/refspec.c @@ -68,7 +68,7 @@ int git_refspec_transform(char *out, size_t outlen, const git_refspec *spec, con baselen = strlen(spec->dst); if (outlen <= baselen) { giterr_set(GITERR_INVALID, "Reference name too long"); - return GIT_ESHORTBUFFER; + return GIT_EBUFS; } /* @@ -90,7 +90,7 @@ int git_refspec_transform(char *out, size_t outlen, const git_refspec *spec, con if (outlen <= baselen + namelen) { giterr_set(GITERR_INVALID, "Reference name too long"); - return GIT_ESHORTBUFFER; + return GIT_EBUFS; } memcpy(out, spec->dst, baselen); diff --git a/src/refspec.h b/src/refspec.h index 64c0ded0c..2db504910 100644 --- a/src/refspec.h +++ b/src/refspec.h @@ -28,7 +28,7 @@ int git_refspec_parse(struct git_refspec *refspec, const char *str); * @param out where to store the target name * @param spec the refspec * @param name the name of the reference to transform - * @return GIT_SUCCESS or error if buffer allocation fails + * @return 0 or error if buffer allocation fails */ int git_refspec_transform_r(git_buf *out, const git_refspec *spec, const char *name); diff --git a/src/remote.c b/src/remote.c index a5cfc822e..9740344f8 100644 --- a/src/remote.c +++ b/src/remote.c @@ -48,7 +48,7 @@ static int parse_remote_refspec(git_config *cfg, git_refspec *refspec, const cha int error; const char *val; - if ((error = git_config_get_string(cfg, var, &val)) < 0) + if ((error = git_config_get_string(&val, cfg, var)) < 0) return error; return refspec_parse(refspec, val); @@ -121,7 +121,7 @@ int git_remote_load(git_remote **out, git_repository *repo, const char *name) goto cleanup; } - if ((error = git_config_get_string(config, git_buf_cstr(&buf), &val)) < 0) + if ((error = git_config_get_string(&val, config, git_buf_cstr(&buf))) < 0) goto cleanup; remote->repo = repo; @@ -338,7 +338,7 @@ int git_remote_update_tips(git_remote *remote, int (*cb)(const char *refname, co assert(remote); if (refs->length == 0) - return GIT_SUCCESS; + return 0; /* HEAD is only allowed to be the first in the list */ head = refs->contents[0]; diff --git a/src/repository.c b/src/repository.c index c5eed531b..6ce3a560f 100644 --- a/src/repository.c +++ b/src/repository.c @@ -25,8 +25,7 @@ #define GIT_BRANCH_MASTER "master" -#define GIT_CONFIG_CORE_REPOSITORYFORMATVERSION "core.repositoryformatversion" -#define GIT_REPOSITORYFORMATVERSION 0 +#define GIT_REPO_VERSION 0 static void drop_odb(git_repository *repo) { @@ -125,7 +124,7 @@ static int load_config_data(git_repository *repo) if (git_repository_config__weakptr(&config, repo) < 0) return -1; - if (git_config_get_bool(config, "core.bare", &is_bare) < 0) + if (git_config_get_bool(&is_bare, config, "core.bare") < 0) return -1; /* FIXME: We assume that a missing core.bare variable is an error. Is this right? */ @@ -146,7 +145,7 @@ static int load_workdir(git_repository *repo, git_buf *parent_path) if (git_repository_config__weakptr(&config, repo) < 0) return -1; - error = git_config_get_string(config, "core.worktree", &worktree); + error = git_config_get_string(&worktree, config, "core.worktree"); if (!error && worktree != NULL) repo->workdir = git__strdup(worktree); else if (error != GIT_ENOTFOUND) @@ -607,13 +606,13 @@ static int check_repositoryformatversion(git_repository *repo) if (git_repository_config__weakptr(&config, repo) < 0) return -1; - if (git_config_get_int32(config, GIT_CONFIG_CORE_REPOSITORYFORMATVERSION, &version) < 0) + if (git_config_get_int32(&version, config, "core.repositoryformatversion") < 0) return -1; - if (GIT_REPOSITORYFORMATVERSION < version) { + if (GIT_REPO_VERSION < version) { giterr_set(GITERR_REPOSITORY, "Unsupported repository version %d. Only versions up to %d are supported.", - version, GIT_REPOSITORYFORMATVERSION); + version, GIT_REPO_VERSION); return -1; } @@ -676,7 +675,7 @@ static int repo_init_config(const char *git_dir, int is_bare) } SET_REPO_CONFIG(bool, "core.bare", is_bare); - SET_REPO_CONFIG(int32, GIT_CONFIG_CORE_REPOSITORYFORMATVERSION, GIT_REPOSITORYFORMATVERSION); + SET_REPO_CONFIG(int32, "core.repositoryformatversion", GIT_REPO_VERSION); /* TODO: what other defaults? */ git_buf_free(&cfg_path); diff --git a/src/revwalk.c b/src/revwalk.c index d0a5120bd..e64d93f20 100644 --- a/src/revwalk.c +++ b/src/revwalk.c @@ -316,7 +316,7 @@ static int merge_bases_many(commit_list **out, git_revwalk *walk, commit_object if ((p->flags & flags) == flags) continue; - if ((error = commit_parse(walk, p)) < GIT_SUCCESS) + if ((error = commit_parse(walk, p)) < 0) return error; p->flags |= flags; @@ -600,7 +600,7 @@ static int revwalk_next_timesort(commit_object **object_out, git_revwalk *walk) } } - return GIT_EREVWALKOVER; + return GIT_REVWALKOVER; } static int revwalk_next_unsorted(commit_object **object_out, git_revwalk *walk) @@ -618,7 +618,7 @@ static int revwalk_next_unsorted(commit_object **object_out, git_revwalk *walk) } } - return GIT_EREVWALKOVER; + return GIT_REVWALKOVER; } static int revwalk_next_toposort(commit_object **object_out, git_revwalk *walk) @@ -629,7 +629,7 @@ static int revwalk_next_toposort(commit_object **object_out, git_revwalk *walk) for (;;) { next = commit_list_pop(&walk->iterator_topo); if (next == NULL) - return GIT_EREVWALKOVER; + return GIT_REVWALKOVER; if (next->in_degree > 0) { next->topo_delay = 1; @@ -654,7 +654,7 @@ static int revwalk_next_toposort(commit_object **object_out, git_revwalk *walk) static int revwalk_next_reverse(commit_object **object_out, git_revwalk *walk) { *object_out = commit_list_pop(&walk->iterator_reverse); - return *object_out ? 0 : GIT_EREVWALKOVER; + return *object_out ? 0 : GIT_REVWALKOVER; } @@ -670,7 +670,7 @@ static int prepare_walk(git_revwalk *walk) * so we know that the walk is already over. */ if (walk->one == NULL) - return GIT_EREVWALKOVER; + return GIT_REVWALKOVER; /* first figure out what the merge bases are */ if (merge_bases_many(&bases, walk, walk->one, &walk->twos) < 0) @@ -698,7 +698,7 @@ static int prepare_walk(git_revwalk *walk) return -1; } - if (error != GIT_EREVWALKOVER) + if (error != GIT_REVWALKOVER) return error; walk->get_next = &revwalk_next_toposort; @@ -710,7 +710,7 @@ static int prepare_walk(git_revwalk *walk) if (commit_list_insert(next, &walk->iterator_reverse) == NULL) return -1; - if (error != GIT_EREVWALKOVER) + if (error != GIT_REVWALKOVER) return error; walk->get_next = &revwalk_next_reverse; @@ -809,9 +809,9 @@ int git_revwalk_next(git_oid *oid, git_revwalk *walk) error = walk->get_next(&next, walk); - if (error == GIT_EREVWALKOVER) { + if (error == GIT_REVWALKOVER) { git_revwalk_reset(walk); - return GIT_EREVWALKOVER; + return GIT_REVWALKOVER; } if (!error) diff --git a/src/signature.c b/src/signature.c index 4d6d11c70..7d329c4c9 100644 --- a/src/signature.c +++ b/src/signature.c @@ -167,7 +167,7 @@ static int parse_timezone_offset(const char *buffer, int *offset_out) if (*offset_start == '\n') { *offset_out = 0; - return GIT_SUCCESS; + return 0; } if (offset_start[0] != '-' && offset_start[0] != '+') @@ -176,7 +176,7 @@ static int parse_timezone_offset(const char *buffer, int *offset_out) if (offset_start[1] < '0' || offset_start[1] > '9') return timezone_error("expected initial digit"); - if (git__strtol32(&dec_offset, offset_start + 1, &offset_end, 10) < GIT_SUCCESS) + if (git__strtol32(&dec_offset, offset_start + 1, &offset_end, 10) < 0) return timezone_error("not a valid number"); if (offset_end - offset_start != 5) diff --git a/src/submodule.c b/src/submodule.c index 1b5b59f45..3c07e657d 100644 --- a/src/submodule.c +++ b/src/submodule.c @@ -218,8 +218,11 @@ static int submodule_from_config( sm->update = (git_submodule_update_t)val; } else if (strcmp(property, "fetchRecurseSubmodules") == 0) { - if (git_config_parse_bool(&sm->fetch_recurse, value) < 0) + if (git__parse_bool(&sm->fetch_recurse, value) < 0) { + giterr_set(GITERR_INVALID, + "Invalid value for submodule 'fetchRecurseSubmodules' property: '%s'", value); goto fail; + } } else if (strcmp(property, "ignore") == 0) { int val; @@ -168,7 +168,7 @@ static int retrieve_tag_reference( return -1; error = git_reference_lookup(&tag_ref, repo, ref_name_out->ptr); - if (error < GIT_SUCCESS) + if (error < 0) return error; /* Be it not foundo or corrupted */ *tag_reference_out = tag_ref; @@ -254,7 +254,7 @@ static int git_tag_create__internal( } error = retrieve_tag_reference_oid(oid, &ref_name, repo, tag_name); - if (error < GIT_SUCCESS && error != GIT_ENOTFOUND) + if (error < 0 && error != GIT_ENOTFOUND) return -1; /** Ensure the tag name doesn't conflict with an already existing @@ -332,7 +332,7 @@ int git_tag_create_frombuffer(git_oid *oid, git_repository *repo, const char *bu } error = retrieve_tag_reference_oid(oid, &ref_name, repo, tag.tag_name); - if (error < GIT_SUCCESS && error != GIT_ENOTFOUND) + if (error < 0 && error != GIT_ENOTFOUND) goto on_error; /* We don't need these objects after this */ @@ -414,7 +414,7 @@ static int tag_list_cb(const char *tag_name, void *payload) return 0; filter = (tag_filter_data *)payload; - if (!*filter->pattern || p_fnmatch(filter->pattern, tag_name + GIT_REFS_TAGS_DIR_LEN, 0) == GIT_SUCCESS) + if (!*filter->pattern || p_fnmatch(filter->pattern, tag_name + GIT_REFS_TAGS_DIR_LEN, 0) == 0) return git_vector_insert(filter->taglist, git__strdup(tag_name)); return 0; @@ -428,7 +428,7 @@ int git_tag_list_match(git_strarray *tag_names, const char *pattern, git_reposit assert(tag_names && repo && pattern); - if (git_vector_init(&taglist, 8, NULL) < GIT_SUCCESS) + if (git_vector_init(&taglist, 8, NULL) < 0) return -1; filter.taglist = &taglist; diff --git a/src/transport.c b/src/transport.c index bc4248d5b..5b2cd7ea4 100644 --- a/src/transport.c +++ b/src/transport.c @@ -37,7 +37,7 @@ static git_transport_cb transport_find_fn(const char *url) } /* still here? Check to see if the path points to a file on the local file system */ - if ((git_path_exists(url) == GIT_SUCCESS) && git_path_isdir(url)) + if ((git_path_exists(url) == 0) && git_path_isdir(url)) return &git_transport_local; /* It could be a SSH remote path. Check to see if there's a : */ @@ -72,7 +72,7 @@ int git_transport_new(git_transport **out, const char *url) } error = fn(&transport); - if (error < GIT_SUCCESS) + if (error < 0) return error; transport->url = git__strdup(url); @@ -80,7 +80,7 @@ int git_transport_new(git_transport **out, const char *url) *out = transport; - return GIT_SUCCESS; + return 0; } /* from remote.h */ diff --git a/src/transports/git.c b/src/transports/git.c index 9a1741941..5baa810f0 100644 --- a/src/transports/git.c +++ b/src/transports/git.c @@ -147,7 +147,7 @@ static int store_refs(transport_git *t) return 0; ret = git_protocol_store_refs(&t->proto, buf->data, buf->offset); - if (ret == GIT_ESHORTBUFFER) { + if (ret == GIT_EBUFS) { gitno_consume_n(buf, buf->len); continue; } @@ -279,7 +279,7 @@ static int recv_pkt(gitno_buffer *buf) return -1; error = git_pkt_parse_line(&pkt, ptr, &line_end, buf->offset); - if (error == GIT_ESHORTBUFFER) + if (error == GIT_EBUFS) continue; if (error < 0) return -1; @@ -344,7 +344,7 @@ static int git_negotiate_fetch(git_transport *transport, git_repository *repo, c } } - if (error < 0 && error != GIT_EREVWALKOVER) + if (error < 0 && error != GIT_REVWALKOVER) goto on_error; /* Tell the other end that we're done negotiating */ @@ -384,10 +384,10 @@ static int git_download_pack(git_transport *transport, git_repository *repo, git } error = git_pkt_parse_line(&pkt, ptr, &line_end, buf->offset); - if (error == GIT_ESHORTBUFFER) + if (error == GIT_EBUFS) break; - if (error < GIT_SUCCESS) + if (error < 0) return error; if (pkt->type == GIT_PKT_PACK) { diff --git a/src/transports/http.c b/src/transports/http.c index bc4a615f1..2a8ebbb09 100644 --- a/src/transports/http.c +++ b/src/transports/http.c @@ -354,10 +354,10 @@ static int on_body_parse_response(http_parser *parser, const char *str, size_t l return 0; error = git_pkt_parse_line(&pkt, ptr, &line_end, git_buf_len(buf)); - if (error == GIT_ESHORTBUFFER) { + if (error == GIT_EBUFS) { return 0; /* Ask for more */ } - if (error < GIT_SUCCESS) + if (error < 0) return t->error = -1; git_buf_consume(buf, line_end); @@ -486,7 +486,7 @@ static int http_negotiate_fetch(git_transport *transport, git_repository *repo, git_buf_clear(&request); git_buf_clear(&data); - if (ret < GIT_SUCCESS || i >= 256) + if (ret < 0 || i >= 256) break; if ((ret = parse_response(t)) < 0) diff --git a/src/transports/local.c b/src/transports/local.c index aa5155ef6..000993e69 100644 --- a/src/transports/local.c +++ b/src/transports/local.c @@ -91,7 +91,7 @@ static int store_refs(transport_local *t) assert(t); - if (git_reference_listall(&ref_names, t->repo, GIT_REF_LISTALL) < 0 || + if (git_reference_list(&ref_names, t->repo, GIT_REF_LISTALL) < 0 || git_vector_init(&t->refs, (unsigned int)ref_names.count, NULL) < 0) goto on_error; diff --git a/src/tree.c b/src/tree.c index 5acee4a41..92b1b1e39 100644 --- a/src/tree.c +++ b/src/tree.c @@ -647,7 +647,7 @@ static int tree_frompath( { char *slash_pos = NULL; const git_tree_entry* entry; - int error = GIT_SUCCESS; + int error = 0; git_tree *subtree; if (!*(treeentry_path->ptr + offset)) { @@ -724,7 +724,7 @@ static int tree_walk_post( git_buf *path, void *payload) { - int error = GIT_SUCCESS; + int error = 0; unsigned int i; for (i = 0; i < tree->entries.length; ++i) { @@ -761,7 +761,7 @@ static int tree_walk_post( int git_tree_walk(git_tree *tree, git_treewalk_cb callback, int mode, void *payload) { - int error = GIT_SUCCESS; + int error = 0; git_buf root_path = GIT_BUF_INIT; switch (mode) { diff --git a/src/util.c b/src/util.c index 9fd5f286c..ce770203a 100644 --- a/src/util.c +++ b/src/util.c @@ -411,3 +411,27 @@ int git__strcmp_cb(const void *a, const void *b) return strcmp(stra, strb); } + +int git__parse_bool(int *out, const char *value) +{ + /* A missing value means true */ + if (value == NULL) { + *out = 1; + return 0; + } + + if (!strcasecmp(value, "true") || + !strcasecmp(value, "yes") || + !strcasecmp(value, "on")) { + *out = 1; + return 0; + } + if (!strcasecmp(value, "false") || + !strcasecmp(value, "no") || + !strcasecmp(value, "off")) { + *out = 0; + return 0; + } + + return -1; +} diff --git a/src/util.h b/src/util.h index cb5e83ce9..c6851ac7e 100644 --- a/src/util.h +++ b/src/util.h @@ -214,4 +214,13 @@ GIT_INLINE(bool) git__iswildcard(int c) return (c == '*' || c == '?' || c == '['); } +/* + * Parse a string value as a boolean, just like Core Git + * does. + * + * Valid values for true are: 'true', 'yes', 'on' + * Valid values for false are: 'false', 'no', 'off' + */ +extern int git__parse_bool(int *out, const char *value); + #endif /* INCLUDE_util_h__ */ |