diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/attr.c | 14 | ||||
| -rw-r--r-- | src/attr_file.c | 14 | ||||
| -rw-r--r-- | src/branch.c | 2 | ||||
| -rw-r--r-- | src/commit.c | 6 | ||||
| -rw-r--r-- | src/config.c | 16 | ||||
| -rw-r--r-- | src/config_cache.c | 2 | ||||
| -rw-r--r-- | src/config_file.c | 12 | ||||
| -rw-r--r-- | src/crlf.c | 2 | ||||
| -rw-r--r-- | src/diff.c | 2 | ||||
| -rw-r--r-- | src/fileops.c | 10 | ||||
| -rw-r--r-- | src/fileops.h | 6 | ||||
| -rw-r--r-- | src/ignore.c | 2 | ||||
| -rw-r--r-- | src/index.c | 2 | ||||
| -rw-r--r-- | src/indexer.c | 8 | ||||
| -rw-r--r-- | src/iterator.c | 6 | ||||
| -rw-r--r-- | src/notes.c | 10 | ||||
| -rw-r--r-- | src/object.c | 6 | ||||
| -rw-r--r-- | src/odb.c | 14 | ||||
| -rw-r--r-- | src/odb.h | 4 | ||||
| -rw-r--r-- | src/odb_loose.c | 2 | ||||
| -rw-r--r-- | src/odb_pack.c | 10 | ||||
| -rw-r--r-- | src/pack.c | 14 | ||||
| -rw-r--r-- | src/path.c | 4 | ||||
| -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/remote.c | 8 | ||||
| -rw-r--r-- | src/repository.c | 10 | ||||
| -rw-r--r-- | src/revwalk.c | 2 | ||||
| -rw-r--r-- | src/status.c | 2 | ||||
| -rw-r--r-- | src/submodule.c | 4 | ||||
| -rw-r--r-- | src/tag.c | 8 | ||||
| -rw-r--r-- | src/transports/git.c | 6 | ||||
| -rw-r--r-- | src/transports/http.c | 2 | ||||
| -rw-r--r-- | src/tree.c | 8 | ||||
| -rw-r--r-- | src/vector.c | 6 |
37 files changed, 121 insertions, 121 deletions
diff --git a/src/attr.c b/src/attr.c index 5fef91427..093f64d5c 100644 --- a/src/attr.c +++ b/src/attr.c @@ -245,13 +245,13 @@ static int load_attr_file( struct stat st; if (p_stat(filename, &st) < 0) - return GIT_NOTFOUND; + return GIT_ENOTFOUND; if (sig != NULL && (git_time_t)st.st_mtime == sig->seconds && (git_off_t)st.st_size == sig->size && (unsigned int)st.st_ino == sig->ino) - return GIT_NOTFOUND; + return GIT_ENOTFOUND; error = git_futils_readbuffer_updated(&content, filename, NULL, NULL); if (error < 0) @@ -286,7 +286,7 @@ static int load_attr_blob_from_index( entry = git_index_get(index, error); if (old_oid && git_oid_cmp(old_oid, &entry->oid) == 0) - return GIT_NOTFOUND; + return GIT_ENOTFOUND; if ((error = git_blob_lookup(blob, repo, &entry->oid)) < 0) return error; @@ -396,7 +396,7 @@ int git_attr_cache__push_file( if (error) { /* not finding a file is not an error for this function */ - if (error == GIT_NOTFOUND) { + if (error == GIT_ENOTFOUND) { giterr_clear(); error = 0; } @@ -550,7 +550,7 @@ static int collect_attr_files( error = git_futils_find_system_file(&dir, GIT_ATTR_FILE_SYSTEM); if (!error) error = push_attr_file(repo, files, NULL, dir.ptr); - else if (error == GIT_NOTFOUND) + else if (error == GIT_ENOTFOUND) error = 0; } @@ -577,11 +577,11 @@ int git_attr_cache__init(git_repository *repo) return -1; ret = git_config_get_string(&cache->cfg_attr_file, cfg, GIT_ATTR_CONFIG); - if (ret < 0 && ret != GIT_NOTFOUND) + if (ret < 0 && ret != GIT_ENOTFOUND) return ret; ret = git_config_get_string(&cache->cfg_excl_file, cfg, GIT_IGNORE_CONFIG); - if (ret < 0 && ret != GIT_NOTFOUND) + if (ret < 0 && ret != GIT_ENOTFOUND) return ret; giterr_clear(); diff --git a/src/attr_file.c b/src/attr_file.c index 601b286cf..5030ad5de 100644 --- a/src/attr_file.c +++ b/src/attr_file.c @@ -99,7 +99,7 @@ int git_attr_file__parse_buffer( /* if the rule wasn't a pattern, on to the next */ if (error < 0) { git_attr_rule__clear(rule); /* reset rule contents */ - if (error == GIT_NOTFOUND) + if (error == GIT_ENOTFOUND) error = 0; } else { rule = NULL; /* vector now "owns" the rule */ @@ -328,7 +328,7 @@ void git_attr_path__free(git_attr_path *info) /* * This will return 0 if the spec was filled out, - * GIT_NOTFOUND if the fnmatch does not require matching, or + * GIT_ENOTFOUND if the fnmatch does not require matching, or * another error code there was an actual problem. */ int git_attr_fnmatch__parse( @@ -347,7 +347,7 @@ int git_attr_fnmatch__parse( while (git__isspace(*pattern)) pattern++; if (!*pattern || *pattern == '#') { *base = git__next_line(pattern); - return GIT_NOTFOUND; + return GIT_ENOTFOUND; } spec->flags = 0; @@ -464,7 +464,7 @@ static int merge_assignments(void **old_raw, void *new_raw) GIT_REFCOUNT_DEC(*old, git_attr_assignment__free); *old = new; - return GIT_EXISTS; + return GIT_EEXISTS; } int git_attr_assignment__parse( @@ -551,7 +551,7 @@ int git_attr_assignment__parse( error = git_vector_insert_sorted( assigns, massign, &merge_assignments); - if (error < 0 && error != GIT_EXISTS) + if (error < 0 && error != GIT_EEXISTS) return error; } } @@ -559,7 +559,7 @@ int git_attr_assignment__parse( /* insert allocated assign into vector */ error = git_vector_insert_sorted(assigns, assign, &merge_assignments); - if (error < 0 && error != GIT_EXISTS) + if (error < 0 && error != GIT_EEXISTS) return error; /* clear assign since it is now "owned" by the vector */ @@ -571,7 +571,7 @@ int git_attr_assignment__parse( *base = git__next_line(scan); - return (assigns->length == 0) ? GIT_NOTFOUND : 0; + return (assigns->length == 0) ? GIT_ENOTFOUND : 0; } static void git_attr_rule__clear(git_attr_rule *rule) diff --git a/src/branch.c b/src/branch.c index 45f67ffdc..9698bbf56 100644 --- a/src/branch.c +++ b/src/branch.c @@ -190,7 +190,7 @@ int git_branch_move(git_repository *repo, const char *old_branch_name, const cha if ((error = git_buf_joinpath(&old_reference_name, GIT_REFS_HEADS_DIR, old_branch_name)) < 0) goto cleanup; - /* We need to be able to return GIT_NOTFOUND */ + /* We need to be able to return GIT_ENOTFOUND */ if ((error = git_reference_lookup(&reference, repo, git_buf_cstr(&old_reference_name))) < 0) goto cleanup; diff --git a/src/commit.c b/src/commit.c index 1c6bee97a..2bf12f3a5 100644 --- a/src/commit.c +++ b/src/commit.c @@ -100,7 +100,7 @@ static int update_reference(git_repository *repo, git_oid *oid, const char *ref_ /* If we haven't found the reference at all, we assume we need to create * a new reference and that's it */ - if (res == GIT_NOTFOUND) { + if (res == GIT_ENOTFOUND) { giterr_clear(); return git_reference_create_oid(NULL, repo, ref_name, oid, 1); } @@ -125,7 +125,7 @@ static int update_reference(git_repository *repo, git_oid *oid, const char *ref_ * this is means we're creating a new branch, for example. * We need to create a new direct reference with that name */ - if (res == GIT_NOTFOUND) { + if (res == GIT_ENOTFOUND) { giterr_clear(); res = git_reference_create_oid(NULL, repo, sym_target, oid, 1); git_reference_free(ref); @@ -320,7 +320,7 @@ int git_commit_parent(git_commit **parent, git_commit *commit, unsigned int n) parent_oid = git_vector_get(&commit->parent_oids, n); if (parent_oid == NULL) { giterr_set(GITERR_INVALID, "Parent %u does not exist", n); - return GIT_NOTFOUND; + return GIT_ENOTFOUND; } return git_commit_lookup(parent, commit->object.repo, parent_oid); diff --git a/src/config.c b/src/config.c index b60faf820..618202c34 100644 --- a/src/config.c +++ b/src/config.c @@ -263,7 +263,7 @@ int git_config_lookup_map_value( size_t i; if (!value) - return GIT_NOTFOUND; + return GIT_ENOTFOUND; for (i = 0; i < map_n; ++i) { git_cvar_map *m = maps + i; @@ -295,7 +295,7 @@ int git_config_lookup_map_value( } } - return GIT_NOTFOUND; + return GIT_ENOTFOUND; } int git_config_get_mapped( @@ -387,12 +387,12 @@ int git_config_get_string(const char **out, git_config *cfg, const char *name) git_vector_foreach(&cfg->files, i, internal) { git_config_file *file = internal->file; int ret = file->get(file, name, out); - if (ret != GIT_NOTFOUND) + if (ret != GIT_ENOTFOUND) return ret; } giterr_set(GITERR_CONFIG, "Config variable '%s' not found", name); - return GIT_NOTFOUND; + return GIT_ENOTFOUND; } int git_config_get_multivar(git_config *cfg, const char *name, const char *regexp, @@ -400,7 +400,7 @@ int git_config_get_multivar(git_config *cfg, const char *name, const char *regex { file_internal *internal; git_config_file *file; - int ret = GIT_NOTFOUND; + int ret = GIT_ENOTFOUND; unsigned int i; assert(cfg->files.length); @@ -413,7 +413,7 @@ int git_config_get_multivar(git_config *cfg, const char *name, const char *regex internal = git_vector_get(&cfg->files, i - 1); file = internal->file; ret = file->get_multivar(file, name, regexp, fn, data); - if (ret < 0 && ret != GIT_NOTFOUND) + if (ret < 0 && ret != GIT_ENOTFOUND) return ret; } @@ -424,14 +424,14 @@ int git_config_set_multivar(git_config *cfg, const char *name, const char *regex { file_internal *internal; git_config_file *file; - int ret = GIT_NOTFOUND; + int ret = GIT_ENOTFOUND; unsigned int i; for (i = cfg->files.length; i > 0; --i) { internal = git_vector_get(&cfg->files, i - 1); file = internal->file; ret = file->set_multivar(file, name, regexp, value); - if (ret < 0 && ret != GIT_NOTFOUND) + if (ret < 0 && ret != GIT_ENOTFOUND) return ret; } diff --git a/src/config_cache.c b/src/config_cache.c index b23fd7b31..ca9602e56 100644 --- a/src/config_cache.c +++ b/src/config_cache.c @@ -72,7 +72,7 @@ int git_repository__cvar(int *out, git_repository *repo, git_cvar_cached cvar) error = git_config_get_mapped(out, config, data->cvar_name, data->maps, data->map_count); - if (error == GIT_NOTFOUND) + if (error == GIT_ENOTFOUND) *out = data->default_value; else if (error < 0) diff --git a/src/config_file.c b/src/config_file.c index 6ecc974ff..cbc48bcd9 100644 --- a/src/config_file.c +++ b/src/config_file.c @@ -161,7 +161,7 @@ static int config_open(git_config_file *cfg) res = git_futils_readbuffer(&b->reader.buffer, b->file_path); /* It's fine if the file doesn't exist */ - if (res == GIT_NOTFOUND) + if (res == GIT_ENOTFOUND) return 0; if (res < 0 || config_parse(b) < 0) { @@ -289,7 +289,7 @@ static int config_get(git_config_file *cfg, const char *name, const char **out) /* no error message; the config system will write one */ if (!git_strmap_valid_index(b->values, pos)) - return GIT_NOTFOUND; + return GIT_ENOTFOUND; *out = ((cvar_t *)git_strmap_value_at(b->values, pos))->value; @@ -315,7 +315,7 @@ static int config_get_multivar( git__free(key); if (!git_strmap_valid_index(b->values, pos)) - return GIT_NOTFOUND; + return GIT_ENOTFOUND; var = git_strmap_value_at(b->values, pos); @@ -377,7 +377,7 @@ static int config_set_multivar( pos = git_strmap_lookup_index(b->values, key); if (!git_strmap_valid_index(b->values, pos)) { git__free(key); - return GIT_NOTFOUND; + return GIT_ENOTFOUND; } var = git_strmap_value_at(b->values, pos); @@ -444,7 +444,7 @@ static int config_delete(git_config_file *cfg, const char *name) git__free(key); if (!git_strmap_valid_index(b->values, pos)) - return GIT_NOTFOUND; + return GIT_ENOTFOUND; var = git_strmap_value_at(b->values, pos); @@ -978,7 +978,7 @@ static int config_write(diskfile_backend *cfg, const char *key, const regex_t *p result = git_futils_readbuffer(&cfg->reader.buffer, cfg->file_path); /* Initialise the reading position */ - if (result == GIT_NOTFOUND) { + if (result == GIT_ENOTFOUND) { cfg->reader.read_ptr = NULL; cfg->reader.eof = 1; data_start = NULL; diff --git a/src/crlf.c b/src/crlf.c index 5fb1be516..303a46d3b 100644 --- a/src/crlf.c +++ b/src/crlf.c @@ -85,7 +85,7 @@ static int crlf_load_attributes(struct crlf_attrs *ca, git_repository *repo, con error = git_attr_get_many(attr_vals, repo, 0, path, NUM_CONV_ATTRS, attr_names); - if (error == GIT_NOTFOUND) { + if (error == GIT_ENOTFOUND) { ca->crlf_action = GIT_CRLF_GUESS; ca->eol = GIT_EOL_UNSET; return 0; diff --git a/src/diff.c b/src/diff.c index 882534f72..0b2f8fb50 100644 --- a/src/diff.c +++ b/src/diff.c @@ -343,7 +343,7 @@ static git_diff_list *git_diff_list_alloc( if (!match) goto fail; ret = git_attr_fnmatch__parse(match, &diff->pool, NULL, &pattern); - if (ret == GIT_NOTFOUND) { + if (ret == GIT_ENOTFOUND) { git__free(match); continue; } else if (ret < 0) diff --git a/src/fileops.c b/src/fileops.c index c467143e4..ee9d4212d 100644 --- a/src/fileops.c +++ b/src/fileops.c @@ -95,7 +95,7 @@ int git_futils_open_ro(const char *path) int fd = p_open(path, O_RDONLY); if (fd < 0) { if (errno == ENOENT) - fd = GIT_NOTFOUND; + fd = GIT_ENOTFOUND; giterr_set(GITERR_OS, "Failed to open '%s'", path); } return fd; @@ -365,7 +365,7 @@ int git_futils_find_global_file(git_buf *path, const char *filename) if (git_path_exists(path->ptr) == false) { git_buf_clear(path); - return GIT_NOTFOUND; + return GIT_ENOTFOUND; } return 0; @@ -414,7 +414,7 @@ static int win32_find_system_file(git_buf *path, const char *filename) char *file_utf8 = NULL; if (!root || !filename || (len = strlen(filename)) == 0) - return GIT_NOTFOUND; + return GIT_ENOTFOUND; /* allocate space for wchar_t path to file */ file_utf16 = git__calloc(root->len + len + 2, sizeof(wchar_t)); @@ -438,7 +438,7 @@ static int win32_find_system_file(git_buf *path, const char *filename) /* check access */ if (_waccess(file_utf16, F_OK) < 0) { - error = GIT_NOTFOUND; + error = GIT_ENOTFOUND; goto cleanup; } @@ -470,6 +470,6 @@ int git_futils_find_system_file(git_buf *path, const char *filename) #ifdef GIT_WIN32 return win32_find_system_file(path, filename); #else - return GIT_NOTFOUND; + return GIT_ENOTFOUND; #endif } diff --git a/src/fileops.h b/src/fileops.h index 8dd4bb61a..be619d620 100644 --- a/src/fileops.h +++ b/src/fileops.h @@ -139,7 +139,7 @@ extern int git_futils_mmap_ro( * @param path path to file to be opened. * @return * - 0 on success; - * - GIT_NOTFOUND if not found; + * - GIT_ENOTFOUND if not found; * - -1 on an unspecified OS related error. */ extern int git_futils_mmap_ro_file( @@ -159,7 +159,7 @@ extern void git_futils_mmap_free(git_map *map); * @param filename name of file to find in the home directory * @return * - 0 if found; - * - GIT_NOTFOUND if not found; + * - GIT_ENOTFOUND if not found; * - -1 on an unspecified OS related error. */ extern int git_futils_find_global_file(git_buf *path, const char *filename); @@ -171,7 +171,7 @@ extern int git_futils_find_global_file(git_buf *path, const char *filename); * @param filename name of file to find in the home directory * @return * - 0 if found; - * - GIT_NOTFOUND if not found; + * - GIT_ENOTFOUND if not found; * - -1 on an unspecified OS related error. */ extern int git_futils_find_system_file(git_buf *path, const char *filename); diff --git a/src/ignore.c b/src/ignore.c index 2a7060501..fc6194bb5 100644 --- a/src/ignore.c +++ b/src/ignore.c @@ -40,7 +40,7 @@ static int parse_ignore_file( git__free(match->pattern); match->pattern = NULL; - if (error == GIT_NOTFOUND) + if (error == GIT_ENOTFOUND) error = 0; } else { match = NULL; /* vector now "owns" the match */ diff --git a/src/index.c b/src/index.c index 03b191356..f1ae9a710 100644 --- a/src/index.c +++ b/src/index.c @@ -411,7 +411,7 @@ static int index_insert(git_index *index, git_index_entry *entry, int replace) * if no entry exists add the entry at the end; * the index is no longer sorted */ - if (position == GIT_NOTFOUND) + if (position == GIT_ENOTFOUND) return git_vector_insert(&index->entries, entry); /* exists, replace it */ diff --git a/src/indexer.c b/src/indexer.c index da6d5d2c8..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_SHORTBUFFER) { + if (error == GIT_EBUFS) { idx->off = entry_start; - return GIT_SHORTBUFFER; + 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_SHORTBUFFER) { + 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_SHORTBUFFER) + if (error == GIT_EBUFS) return 0; if (error < 0) return error; diff --git a/src/iterator.c b/src/iterator.c index cb9838dbc..819b0e22a 100644 --- a/src/iterator.c +++ b/src/iterator.c @@ -468,7 +468,7 @@ static int workdir_iterator__expand_dir(workdir_iterator *wi) error = git_path_dirload_with_stat(wi->path.ptr, wi->root_len, &wf->entries); if (error < 0 || wf->entries.length == 0) { workdir_iterator__free_frame(wf); - return GIT_NOTFOUND; + return GIT_ENOTFOUND; } git_vector_sort(&wf->entries); @@ -635,7 +635,7 @@ static int workdir_iterator__update_entry(workdir_iterator *wi) if (!is_submodule) { int res = git_submodule_lookup(NULL, wi->repo, wi->entry.path); is_submodule = (res == 0); - if (res == GIT_NOTFOUND) + if (res == GIT_ENOTFOUND) giterr_clear(); } @@ -683,7 +683,7 @@ int git_iterator_for_workdir_range( wi->root_len = wi->path.size; if ((error = workdir_iterator__expand_dir(wi)) < 0) { - if (error == GIT_NOTFOUND) + if (error == GIT_ENOTFOUND) error = 0; else { git_iterator_free((git_iterator *)wi); diff --git a/src/notes.c b/src/notes.c index afd6fc23d..84ad94087 100644 --- a/src/notes.c +++ b/src/notes.c @@ -73,7 +73,7 @@ static int find_blob(git_oid *blob, git_tree *tree, const char *target) return 0; } } - return GIT_NOTFOUND; + return GIT_ENOTFOUND; } static int note_write(git_oid *out, git_repository *repo, @@ -96,11 +96,11 @@ static int note_write(git_oid *out, git_repository *repo, return error; error = find_blob(&oid, tree, target + fanout); - if (error != GIT_NOTFOUND) { + if (error != GIT_ENOTFOUND) { git_tree_free(tree); if (!error) { giterr_set(GITERR_REPOSITORY, "Note for '%s' exists already", target); - error = GIT_EXISTS; + error = GIT_EEXISTS; } return error; } @@ -275,7 +275,7 @@ static int note_get_default_ref(const char **out, git_repository *repo) return -1; ret = git_config_get_string(out, cfg, "core.notesRef"); - if (ret == GIT_NOTFOUND) { + if (ret == GIT_ENOTFOUND) { *out = GIT_NOTES_DEFAULT_REF; return 0; } @@ -352,7 +352,7 @@ int git_note_create( return -1; error = git_reference_lookup(&ref, repo, notes_ref); - if (error < 0 && error != GIT_NOTFOUND) + if (error < 0 && error != GIT_ENOTFOUND) return error; if (!error) { diff --git a/src/object.c b/src/object.c index 0c40c05c2..d3673eda0 100644 --- a/src/object.c +++ b/src/object.c @@ -92,7 +92,7 @@ int git_object_lookup_prefix( assert(repo && object_out && id); if (len < GIT_OID_MINPREFIXLEN) - return GIT_AMBIGUOUS; + return GIT_EAMBIGUOUS; error = git_repository_odb__weakptr(&odb, repo); if (error < 0) @@ -110,7 +110,7 @@ int git_object_lookup_prefix( if (type != GIT_OBJ_ANY && type != object->type) { git_object_free(object); giterr_set(GITERR_ODB, "The given type does not match the type in ODB"); - return GIT_NOTFOUND; + return GIT_ENOTFOUND; } *object_out = object; @@ -151,7 +151,7 @@ int git_object_lookup_prefix( if (type != GIT_OBJ_ANY && type != odb_obj->raw.type) { git_odb_object_free(odb_obj); giterr_set(GITERR_ODB, "The given type does not match the type on the ODB"); - return GIT_NOTFOUND; + return GIT_ENOTFOUND; } type = odb_obj->raw.type; @@ -485,7 +485,7 @@ int git_odb_exists(git_odb *db, const git_oid *id) int git_odb_read_header(size_t *len_p, git_otype *type_p, git_odb *db, const git_oid *id) { unsigned int i; - int error = GIT_NOTFOUND; + int error = GIT_ENOTFOUND; git_odb_object *object; assert(db && id); @@ -524,7 +524,7 @@ int git_odb_read_header(size_t *len_p, git_otype *type_p, git_odb *db, const git int git_odb_read(git_odb_object **out, git_odb *db, const git_oid *id) { unsigned int i; - int error = GIT_NOTFOUND; + int error = GIT_ENOTFOUND; git_rawobj raw; assert(out && db && id); @@ -541,7 +541,7 @@ int git_odb_read(git_odb_object **out, git_odb *db, const git_oid *id) error = b->read(&raw.data, &raw.len, &raw.type, b, id); } - /* TODO: If no backends are configured, this returns GIT_NOTFOUND but + /* TODO: If no backends are configured, this returns GIT_ENOTFOUND but * will never have called giterr_set(). */ @@ -556,7 +556,7 @@ int git_odb_read_prefix( git_odb_object **out, git_odb *db, const git_oid *short_id, unsigned int len) { unsigned int i; - int error = GIT_NOTFOUND; + int error = GIT_ENOTFOUND; git_oid found_full_oid = {{0}}; git_rawobj raw; bool found = false; @@ -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_NOTFOUND || error == GIT_PASSTHROUGH) + if (error == GIT_ENOTFOUND || error == GIT_PASSTHROUGH) continue; if (error) @@ -698,12 +698,12 @@ int git_odb__error_notfound(const char *message, const git_oid *oid) } else giterr_set(GITERR_ODB, "Object not found - %s", message); - return GIT_NOTFOUND; + return GIT_ENOTFOUND; } int git_odb__error_ambiguous(const char *message) { giterr_set(GITERR_ODB, "Ambiguous SHA1 prefix - %s", message); - return GIT_AMBIGUOUS; + return GIT_EAMBIGUOUS; } @@ -68,12 +68,12 @@ int git_odb__hashfd(git_oid *out, git_file fd, size_t size, git_otype type); int git_odb__hashlink(git_oid *out, const char *path); /* - * Generate a GIT_NOTFOUND error for the ODB. + * Generate a GIT_ENOTFOUND error for the ODB. */ int git_odb__error_notfound(const char *message, const git_oid *oid); /* - * Generate a GIT_AMBIGUOUS error for the ODB. + * Generate a GIT_EAMBIGUOUS error for the ODB. */ int git_odb__error_ambiguous(const char *message); diff --git a/src/odb_loose.c b/src/odb_loose.c index c229b544e..989b03ab2 100644 --- a/src/odb_loose.c +++ b/src/odb_loose.c @@ -460,7 +460,7 @@ static int locate_object( int error = object_file_name(object_location, backend->objects_dir, oid); if (!error && !git_path_exists(object_location->ptr)) - return GIT_NOTFOUND; + return GIT_ENOTFOUND; return error; } diff --git a/src/odb_pack.c b/src/odb_pack.c index e03879ee2..458f288d9 100644 --- a/src/odb_pack.c +++ b/src/odb_pack.c @@ -141,7 +141,7 @@ static int pack_entry_find(struct git_pack_entry *e, /* Can find the offset of an object given * a prefix of an identifier. - * Sets GIT_AMBIGUOUS if short oid is ambiguous. + * Sets GIT_EAMBIGUOUS if short oid is ambiguous. * This method assumes that len is between * GIT_OID_MINPREFIXLEN and GIT_OID_HEXSZ. */ @@ -224,7 +224,7 @@ static int packfile_load__cb(void *_data, git_buf *path) } error = git_packfile_check(&pack, path->ptr); - if (error == GIT_NOTFOUND) + if (error == GIT_ENOTFOUND) /* ignore missing .pack file as git does */ return 0; else if (error < 0) @@ -306,7 +306,7 @@ static int pack_entry_find_prefix( if (backend->last_found) { error = git_pack_entry_find(e, backend->last_found, short_oid, len); - if (error == GIT_AMBIGUOUS) + if (error == GIT_EAMBIGUOUS) return error; if (!error) found = 1; @@ -320,7 +320,7 @@ static int pack_entry_find_prefix( continue; error = git_pack_entry_find(e, p, short_oid, len); - if (error == GIT_AMBIGUOUS) + if (error == GIT_EAMBIGUOUS) return error; if (!error) { if (++found > 1) @@ -354,7 +354,7 @@ int pack_backend__read_header(git_rawobj *obj, git_odb_backend *backend, const g assert(obj && backend && oid); if (locate_packfile(&location, (struct pack_backend *)backend, oid) < 0) - return GIT_NOTFOUND; + return GIT_ENOTFOUND; return read_header_packed(obj, &location); } diff --git a/src/pack.c b/src/pack.c index 66a23f295..0db1069de 100644 --- a/src/pack.c +++ b/src/pack.c @@ -28,7 +28,7 @@ int packfile_unpack_compressed( /* Can find the offset of an object given * a prefix of an identifier. - * Throws GIT_AMBIGUOUSOIDPREFIX if short oid + * Throws GIT_EAMBIGUOUSOIDPREFIX if short oid * is ambiguous within the pack. * This method assumes that len is between * GIT_OID_MINPREFIXLEN and GIT_OID_HEXSZ. @@ -222,7 +222,7 @@ static int packfile_unpack_header1( shift = 4; while (c & 0x80) { if (len <= used) - return GIT_SHORTBUFFER; + 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_SHORTBUFFER; + return GIT_EBUFS; ret = packfile_unpack_header1(&used, size_p, type_p, base, left); git_mwindow_close(w_curs); - if (ret == GIT_SHORTBUFFER) + 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_SHORTBUFFER; + 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_SHORTBUFFER; + 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_SHORTBUFFER; + return GIT_EBUFS; base_offset += 1; if (!base_offset || MSB(base_offset, 7)) return 0; /* overflow */ diff --git a/src/path.c b/src/path.c index ba67544de..84edf6d89 100644 --- a/src/path.c +++ b/src/path.c @@ -206,7 +206,7 @@ int git_path_prettify(git_buf *path_out, const char *path, const char *base) if (p_realpath(path, buf) == NULL) { /* giterr_set resets the errno when dealing with a GITERR_OS kind of error */ - int error = (errno == ENOENT || errno == ENOTDIR) ? GIT_NOTFOUND : -1; + int error = (errno == ENOENT || errno == ENOTDIR) ? GIT_ENOTFOUND : -1; giterr_set(GITERR_OS, "Failed to resolve path '%s'", path); git_buf_clear(path_out); @@ -390,7 +390,7 @@ int git_path_lstat(const char *path, struct stat *st) int err = 0; if (p_lstat(path, st) < 0) { - err = (errno == ENOENT) ? GIT_NOTFOUND : -1; + err = (errno == ENOENT) ? GIT_ENOTFOUND : -1; giterr_set(GITERR_OS, "Failed to stat file '%s'", path); } @@ -208,7 +208,7 @@ int git_pkt_parse_line( /* Not even enough for the length */ if (bufflen > 0 && bufflen < PKT_LEN_SIZE) - return GIT_SHORTBUFFER; + 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_SHORTBUFFER; + return GIT_EBUFS; line += PKT_LEN_SIZE; /* diff --git a/src/protocol.c b/src/protocol.c index 184903388..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_SHORTBUFFER) + 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 88e2218d1..1ef3e13a4 100644 --- a/src/refs.c +++ b/src/refs.c @@ -437,7 +437,7 @@ static int packed_load(git_repository *repo) * for us here, so just return. Anything else means we need to * refresh the packed refs. */ - if (result == GIT_NOTFOUND) { + if (result == GIT_ENOTFOUND) { git_strmap_clear(ref_cache->packfile); return 0; } @@ -917,7 +917,7 @@ static int reference_can_write( if (exists) { giterr_set(GITERR_REFERENCE, "A reference with that name (%s) already exists", refname); - return GIT_EXISTS; + return GIT_EEXISTS; } } @@ -962,7 +962,7 @@ static int packed_lookup(git_reference *ref) pos = git_strmap_lookup_index(packfile_refs, ref->name); if (!git_strmap_valid_index(packfile_refs, pos)) { giterr_set(GITERR_REFERENCE, "Reference '%s' not found", ref->name); - return GIT_NOTFOUND; + return GIT_ENOTFOUND; } pack_ref = git_strmap_value_at(packfile_refs, pos); @@ -984,7 +984,7 @@ static int reference_lookup(git_reference *ref) /* only try to lookup this reference on the packfile if it * wasn't found on the loose refs; not if there was a critical error */ - if (result == GIT_NOTFOUND) { + if (result == GIT_ENOTFOUND) { giterr_clear(); result = packed_lookup(ref); if (result == 0) diff --git a/src/refspec.c b/src/refspec.c index adb162df9..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_SHORTBUFFER; + 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_SHORTBUFFER; + return GIT_EBUFS; } memcpy(out, spec->dst, baselen); diff --git a/src/remote.c b/src/remote.c index db4d0a7fd..9740344f8 100644 --- a/src/remote.c +++ b/src/remote.c @@ -135,7 +135,7 @@ int git_remote_load(git_remote **out, git_repository *repo, const char *name) } error = parse_remote_refspec(config, &remote->fetch, git_buf_cstr(&buf)); - if (error == GIT_NOTFOUND) + if (error == GIT_ENOTFOUND) error = 0; if (error < 0) { @@ -150,7 +150,7 @@ int git_remote_load(git_remote **out, git_repository *repo, const char *name) } error = parse_remote_refspec(config, &remote->push, git_buf_cstr(&buf)); - if (error == GIT_NOTFOUND) + if (error == GIT_ENOTFOUND) error = 0; if (error < 0) { @@ -357,10 +357,10 @@ int git_remote_update_tips(git_remote *remote, int (*cb)(const char *refname, co goto on_error; error = git_reference_name_to_oid(&old, remote->repo, refname.ptr); - if (error < 0 && error != GIT_NOTFOUND) + if (error < 0 && error != GIT_ENOTFOUND) goto on_error; - if (error == GIT_NOTFOUND) + if (error == GIT_ENOTFOUND) memset(&old, 0, GIT_OID_RAWSZ); if (!git_oid_cmp(&old, &head->oid)) diff --git a/src/repository.c b/src/repository.c index 2979b446e..6ce3a560f 100644 --- a/src/repository.c +++ b/src/repository.c @@ -148,7 +148,7 @@ static int load_workdir(git_repository *repo, git_buf *parent_path) error = git_config_get_string(&worktree, config, "core.worktree"); if (!error && worktree != NULL) repo->workdir = git__strdup(worktree); - else if (error != GIT_NOTFOUND) + else if (error != GIT_ENOTFOUND) return error; else { giterr_clear(); @@ -342,7 +342,7 @@ static int find_repo( if (!git_buf_len(repo_path) && !error) { giterr_set(GITERR_REPOSITORY, "Could not find repository from '%s'", start_path); - error = GIT_NOTFOUND; + error = GIT_ENOTFOUND; } return error; @@ -403,7 +403,7 @@ int git_repository_discover( *repository_path = '\0'; if ((error = find_repo(&path, NULL, start_path, flags, ceiling_dirs)) < 0) - return error != GIT_NOTFOUND ? -1 : error; + return error != GIT_ENOTFOUND ? -1 : error; if (size < (size_t)(path.size + 1)) { giterr_set(GITERR_REPOSITORY, @@ -851,7 +851,7 @@ int git_repository_head_orphan(git_repository *repo) error = git_repository_head(&ref, repo); git_reference_free(ref); - if (error == GIT_NOTFOUND) + if (error == GIT_ENOTFOUND) return 1; if (error < 0) @@ -883,7 +883,7 @@ int git_repository_is_empty(git_repository *repo) git_reference_free(head); git_reference_free(branch); - if (error == GIT_NOTFOUND) + if (error == GIT_ENOTFOUND) return 1; if (error < 0) diff --git a/src/revwalk.c b/src/revwalk.c index 67695f84b..e64d93f20 100644 --- a/src/revwalk.c +++ b/src/revwalk.c @@ -375,7 +375,7 @@ int git_merge_base(git_oid *out, git_repository *repo, git_oid *one, git_oid *tw if (!result) { git_revwalk_free(walk); - return GIT_NOTFOUND; + return GIT_ENOTFOUND; } git_oid_cpy(out, &result->item->oid); diff --git a/src/status.c b/src/status.c index 6676cd38f..e9ad3cfe4 100644 --- a/src/status.c +++ b/src/status.c @@ -214,7 +214,7 @@ int git_status_file( if (!error && !sfi.count) { giterr_set(GITERR_INVALID, "Attempt to get status of nonexistent file '%s'", path); - error = GIT_NOTFOUND; + error = GIT_ENOTFOUND; } *status_flags = sfi.status; diff --git a/src/submodule.c b/src/submodule.c index a63043fd5..3c07e657d 100644 --- a/src/submodule.c +++ b/src/submodule.c @@ -351,7 +351,7 @@ int git_submodule_foreach( git_strmap_foreach_value(repo->submodules, sm, { /* usually the following will not come into play */ if (sm->refcount > 1) { - if (git_vector_bsearch(&seen, sm) != GIT_NOTFOUND) + if (git_vector_bsearch(&seen, sm) != GIT_ENOTFOUND) continue; if ((error = git_vector_insert(&seen, sm)) < 0) break; @@ -378,7 +378,7 @@ int git_submodule_lookup( pos = git_strmap_lookup_index(repo->submodules, name); if (!git_strmap_valid_index(repo->submodules, pos)) - return GIT_NOTFOUND; + return GIT_ENOTFOUND; if (sm_ptr) *sm_ptr = git_strmap_value_at(repo->submodules, pos); @@ -254,7 +254,7 @@ static int git_tag_create__internal( } error = retrieve_tag_reference_oid(oid, &ref_name, repo, tag_name); - if (error < 0 && error != GIT_NOTFOUND) + if (error < 0 && error != GIT_ENOTFOUND) return -1; /** Ensure the tag name doesn't conflict with an already existing @@ -262,7 +262,7 @@ static int git_tag_create__internal( if (error == 0 && !allow_ref_overwrite) { git_buf_free(&ref_name); giterr_set(GITERR_TAG, "Tag already exists"); - return GIT_EXISTS; + return GIT_EEXISTS; } if (create_tag_annotation) { @@ -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 < 0 && error != GIT_NOTFOUND) + if (error < 0 && error != GIT_ENOTFOUND) goto on_error; /* We don't need these objects after this */ @@ -345,7 +345,7 @@ int git_tag_create_frombuffer(git_oid *oid, git_repository *repo, const char *bu * reference unless overwriting has explictly been requested **/ if (error == 0 && !allow_ref_overwrite) { giterr_set(GITERR_TAG, "Tag already exists"); - return GIT_EXISTS; + return GIT_EEXISTS; } /* write the buffer */ diff --git a/src/transports/git.c b/src/transports/git.c index c8f50800d..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_SHORTBUFFER) { + 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_SHORTBUFFER) + if (error == GIT_EBUFS) continue; if (error < 0) return -1; @@ -384,7 +384,7 @@ 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_SHORTBUFFER) + if (error == GIT_EBUFS) break; if (error < 0) diff --git a/src/transports/http.c b/src/transports/http.c index b382f7cd7..2a8ebbb09 100644 --- a/src/transports/http.c +++ b/src/transports/http.c @@ -354,7 +354,7 @@ 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_SHORTBUFFER) { + if (error == GIT_EBUFS) { return 0; /* Ask for more */ } if (error < 0) diff --git a/src/tree.c b/src/tree.c index a5fe2b63c..92b1b1e39 100644 --- a/src/tree.c +++ b/src/tree.c @@ -117,7 +117,7 @@ static int tree_key_search(git_vector *entries, const char *filename) } /* The filename doesn't exist at all */ - return GIT_NOTFOUND; + return GIT_ENOTFOUND; } void git_tree__free(git_tree *tree) @@ -186,7 +186,7 @@ const git_tree_entry *git_tree_entry_byname(git_tree *tree, const char *filename assert(tree && filename); idx = tree_key_search(&tree->entries, filename); - if (idx == GIT_NOTFOUND) + if (idx == GIT_ENOTFOUND) return NULL; return git_vector_get(&tree->entries, idx); @@ -518,7 +518,7 @@ int git_treebuilder_insert(git_tree_entry **entry_out, git_treebuilder *bld, con git_oid_cpy(&entry->oid, id); entry->attr = attributes; - if (pos == GIT_NOTFOUND) { + if (pos == GIT_ENOTFOUND) { if (git_vector_insert(&bld->entries, entry) < 0) return -1; } @@ -682,7 +682,7 @@ static int tree_frompath( giterr_set(GITERR_TREE, "No tree entry can be found from " "the given tree and relative path '%s'.", treeentry_path->ptr); - return GIT_NOTFOUND; + return GIT_ENOTFOUND; } diff --git a/src/vector.c b/src/vector.c index 6bd1e9311..6f9aacccf 100644 --- a/src/vector.c +++ b/src/vector.c @@ -137,7 +137,7 @@ int git_vector_bsearch3( if (at_pos != NULL) *at_pos = (unsigned int)pos; - return (rval >= 0) ? (int)pos : GIT_NOTFOUND; + return (rval >= 0) ? (int)pos : GIT_ENOTFOUND; } int git_vector_search2( @@ -152,7 +152,7 @@ int git_vector_search2( return i; } - return GIT_NOTFOUND; + return GIT_ENOTFOUND; } static int strict_comparison(const void *a, const void *b) @@ -172,7 +172,7 @@ int git_vector_remove(git_vector *v, unsigned int idx) assert(v); if (idx >= v->length || v->length == 0) - return GIT_NOTFOUND; + return GIT_ENOTFOUND; for (i = idx; i < v->length - 1; ++i) v->contents[i] = v->contents[i + 1]; |