Browse files

errors: Rename error codes

  • Loading branch information...
1 parent e172cf0 commit 904b67e69fa15b7a3246e43b3d78645ffa2331f6 @vmg vmg committed May 17, 2012
Showing with 171 additions and 170 deletions.
  1. +2 −2 examples/diff.c
  2. +2 −2 include/git2/branch.h
  3. +6 −5 include/git2/errors.h
  4. +4 −4 include/git2/odb.h
  5. +1 −1 include/git2/refspec.h
  6. +1 −1 include/git2/status.h
  7. +2 −2 include/git2/submodule.h
  8. +2 −2 include/git2/tag.h
  9. +1 −1 include/git2/tree.h
  10. +7 −7 src/attr.c
  11. +7 −7 src/attr_file.c
  12. +1 −1 src/branch.c
  13. +3 −3 src/commit.c
  14. +8 −8 src/config.c
  15. +1 −1 src/config_cache.c
  16. +6 −6 src/config_file.c
  17. +1 −1 src/crlf.c
  18. +1 −1 src/diff.c
  19. +5 −5 src/fileops.c
  20. +3 −3 src/fileops.h
  21. +1 −1 src/ignore.c
  22. +1 −1 src/index.c
  23. +4 −4 src/indexer.c
  24. +3 −3 src/iterator.c
  25. +5 −5 src/notes.c
  26. +3 −3 src/object.c
  27. +7 −7 src/odb.c
  28. +2 −2 src/odb.h
  29. +1 −1 src/odb_loose.c
  30. +5 −5 src/odb_pack.c
  31. +7 −7 src/pack.c
  32. +2 −2 src/path.c
  33. +2 −2 src/pkt.c
  34. +1 −1 src/protocol.c
  35. +4 −4 src/refs.c
  36. +2 −2 src/refspec.c
  37. +4 −4 src/remote.c
  38. +5 −5 src/repository.c
  39. +1 −1 src/revwalk.c
  40. +1 −1 src/status.c
  41. +2 −2 src/submodule.c
  42. +4 −4 src/tag.c
  43. +3 −3 src/transports/git.c
  44. +1 −1 src/transports/http.c
  45. +4 −4 src/tree.c
  46. +3 −3 src/vector.c
  47. +2 −2 tests-clar/config/write.c
  48. +2 −2 tests-clar/core/path.c
  49. +1 −1 tests-clar/core/vector.c
  50. +1 −1 tests-clar/index/tests.c
  51. +1 −1 tests-clar/network/remotes.c
  52. +1 −1 tests-clar/notes/notes.c
  53. +4 −4 tests-clar/object/lookup.c
  54. +2 −2 tests-clar/object/tree/frompath.c
  55. +1 −1 tests-clar/refs/branches/delete.c
  56. +1 −1 tests-clar/refs/branches/move.c
  57. +5 −5 tests-clar/repo/discover.c
  58. +1 −1 tests-clar/repo/open.c
  59. +1 −1 tests-clar/revwalk/mergebase.c
  60. +2 −2 tests-clar/status/submodules.c
  61. +4 −4 tests-clar/status/worktree.c
View
4 examples/diff.c
@@ -36,7 +36,7 @@ int resolve_to_tree(git_repository *repo, const char *identifier, git_tree **tre
}
if (obj == NULL)
- return GIT_NOTFOUND;
+ return GIT_ENOTFOUND;
switch (git_object_type(obj)) {
case GIT_OBJ_TREE:
@@ -47,7 +47,7 @@ int resolve_to_tree(git_repository *repo, const char *identifier, git_tree **tre
git_object_free(obj);
break;
default:
- err = GIT_NOTFOUND;
+ err = GIT_ENOTFOUND;
}
return err;
View
4 include/git2/branch.h
@@ -63,7 +63,7 @@ GIT_EXTERN(int) git_branch_create(
* @param branch_type Type of the considered branch. This should
* be valued with either GIT_BRANCH_LOCAL or GIT_BRANCH_REMOTE.
*
- * @return 0 on success, GIT_NOTFOUND if the branch
+ * @return 0 on success, GIT_ENOTFOUND if the branch
* doesn't exist or an error code.
*/
GIT_EXTERN(int) git_branch_delete(
@@ -108,7 +108,7 @@ GIT_EXTERN(int) git_branch_list(
*
* @param force Overwrite existing branch.
*
- * @return 0 on success, GIT_NOTFOUND if the branch
+ * @return 0 on success, GIT_ENOTFOUND if the branch
* doesn't exist or an error code.
*/
GIT_EXTERN(int) git_branch_move(
View
11 include/git2/errors.h
@@ -58,12 +58,13 @@ enum {
enum {
GIT_OK = 0,
GIT_ERROR = -1,
- GIT_NOTFOUND = -3,
- GIT_EXISTS = -23,
- GIT_AMBIGUOUS = -29,
+ GIT_ENOTFOUND = -3,
+ GIT_EEXISTS = -4,
+ GIT_EAMBIGUOUS = -5,
+ GIT_EBUFS = -6,
+
GIT_PASSTHROUGH = -30,
- GIT_SHORTBUFFER = -32,
- GIT_REVWALKOVER = -33,
+ GIT_REVWALKOVER = -31,
};
typedef struct {
View
8 include/git2/odb.h
@@ -109,7 +109,7 @@ GIT_EXTERN(void) git_odb_free(git_odb *db);
* @param id identity of the object to read.
* @return
* - 0 if the object was read;
- * - GIT_NOTFOUND if the object is not in the database.
+ * - GIT_ENOTFOUND if the object is not in the database.
*/
GIT_EXTERN(int) git_odb_read(git_odb_object **out, git_odb *db, const git_oid *id);
@@ -136,8 +136,8 @@ GIT_EXTERN(int) git_odb_read(git_odb_object **out, git_odb *db, const git_oid *i
* @param short_id a prefix of the id of the object to read.
* @param len the length of the prefix
* @return 0 if the object was read;
- * GIT_NOTFOUND if the object is not in the database.
- * GIT_AMBIGUOUS if the prefix is ambiguous (several objects match the prefix)
+ * GIT_ENOTFOUND if the object is not in the database.
+ * GIT_EAMBIGUOUS if the prefix is ambiguous (several objects match the prefix)
*/
GIT_EXTERN(int) git_odb_read_prefix(git_odb_object **out, git_odb *db, const git_oid *short_id, unsigned int len);
@@ -157,7 +157,7 @@ GIT_EXTERN(int) git_odb_read_prefix(git_odb_object **out, git_odb *db, const git
* @param id identity of the object to read.
* @return
* - 0 if the object was read;
- * - GIT_NOTFOUND if the object is not in the database.
+ * - GIT_ENOTFOUND if the object is not in the database.
*/
GIT_EXTERN(int) git_odb_read_header(size_t *len_p, git_otype *type_p, git_odb *db, const git_oid *id);
View
2 include/git2/refspec.h
@@ -51,7 +51,7 @@ GIT_EXTERN(int) git_refspec_src_matches(const git_refspec *refspec, const char *
* @param outlen the size ouf the `out` buffer
* @param spec the refspec
* @param name the name of the reference to transform
- * @return 0, GIT_SHORTBUFFER or another error
+ * @return 0, GIT_EBUFS or another error
*/
GIT_EXTERN(int) git_refspec_transform(char *out, size_t outlen, const git_refspec *spec, const char *name);
View
2 include/git2/status.h
@@ -131,7 +131,7 @@ GIT_EXTERN(int) git_status_foreach_ext(
* @param status_flags the status value
* @param repo a repository object
* @param path the file to retrieve status for, rooted at the repo's workdir
- * @return GIT_EINVALIDPATH when `path` points at a folder, GIT_NOTFOUND when
+ * @return GIT_EINVALIDPATH when `path` points at a folder, GIT_ENOTFOUND when
* the file doesn't exist in any of HEAD, the index or the worktree,
* 0 otherwise
*/
View
4 include/git2/submodule.h
@@ -85,13 +85,13 @@ GIT_EXTERN(int) git_submodule_foreach(
*
* Given either the submodule name or path (they are ususally the same),
* this returns a structure describing the submodule. If the submodule
- * does not exist, this will return GIT_NOTFOUND and set the submodule
+ * does not exist, this will return GIT_ENOTFOUND and set the submodule
* pointer to NULL.
*
* @param submodule Pointer to submodule description object pointer..
* @param repo The repository.
* @param name The name of the submodule. Trailing slashes will be ignored.
- * @return 0 on success, GIT_NOTFOUND if submodule does not exist, -1 on error
+ * @return 0 on success, GIT_ENOTFOUND if submodule does not exist, -1 on error
*/
GIT_EXTERN(int) git_submodule_lookup(
git_submodule **submodule,
View
4 include/git2/tag.h
@@ -143,7 +143,7 @@ GIT_EXTERN(const char *) git_tag_message(git_tag *tag);
* @param oid Pointer where to store the OID of the
* newly created tag. If the tag already exists, this parameter
* will be the oid of the existing tag, and the function will
- * return a GIT_EXISTS error code.
+ * return a GIT_EEXISTS error code.
*
* @param repo Repository where to store the tag
*
@@ -199,7 +199,7 @@ GIT_EXTERN(int) git_tag_create_frombuffer(
* @param oid Pointer where to store the OID of the provided
* target object. If the tag already exists, this parameter
* will be filled with the oid of the existing pointed object
- * and the function will return a GIT_EXISTS error code.
+ * and the function will return a GIT_EEXISTS error code.
*
* @param repo Repository where to store the lightweight tag
*
View
2 include/git2/tree.h
@@ -278,7 +278,7 @@ GIT_EXTERN(int) git_treebuilder_write(git_oid *oid, git_repository *repo, git_tr
* @param subtree Pointer where to store the subtree
* @param root A previously loaded tree which will be the root of the relative path
* @param subtree_path Path to the contained subtree
- * @return 0 on success; GIT_NOTFOUND if the path does not lead to a subtree
+ * @return 0 on success; GIT_ENOTFOUND if the path does not lead to a subtree
*/
GIT_EXTERN(int) git_tree_get_subtree(git_tree **subtree, git_tree *root, const char *subtree_path);
View
14 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();
View
14 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,15 +551,15 @@ 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;
}
}
}
/* 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)
View
2 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;
View
6 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);
View
16 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,20 +387,20 @@ 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,
int (*fn)(const char *value, void *data), void *data)
{
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;
}
View
2 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)
View
12 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;
View
2 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;
View
2 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)
View
10 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
}
View
6 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);
View
2 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 */
View
2 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 */
View
8 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,15 +355,15 @@ 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;
}
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;
View
6 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);
View
10 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) {
View
6 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;
View
14 src/odb.c
@@ -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;
}
View
4 src/odb.h
@@ -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);
View
2 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;
}
View
10 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);
}
View
14 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 */
View
4 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);
}
View
4 src/pkt.c
@@ -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;
/*
View
2 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;
View
8 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)
View
4 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);
View
8 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))
View
10 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)
View
2 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);
View
2 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;
View
4 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);
View
8 src/tag.c
@@ -254,15 +254,15 @@ 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
* reference unless overwriting has explictly been requested **/
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 */
View
6 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)
View
2 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)
View
8 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;
}
View
6 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];
View
4 tests-clar/config/write.c
@@ -62,7 +62,7 @@ void test_config_write__delete_value(void)
git_config_free(cfg);
cl_git_pass(git_config_open_ondisk(&cfg, "config9"));
- cl_assert(git_config_get_int32(&i, cfg, "core.dummy") == GIT_NOTFOUND);
+ cl_assert(git_config_get_int32(&i, cfg, "core.dummy") == GIT_ENOTFOUND);
cl_git_pass(git_config_set_int32(cfg, "core.dummy", 1));
git_config_free(cfg);
}
@@ -87,6 +87,6 @@ void test_config_write__delete_inexistent(void)
git_config *cfg;
cl_git_pass(git_config_open_ondisk(&cfg, "config9"));
- cl_assert(git_config_delete(cfg, "core.imaginary") == GIT_NOTFOUND);
+ cl_assert(git_config_delete(cfg, "core.imaginary") == GIT_ENOTFOUND);
git_config_free(cfg);
}
View
4 tests-clar/core/path.c
@@ -413,8 +413,8 @@ void test_core_path__13_cannot_prettify_a_non_existing_file(void)
git_buf p = GIT_BUF_INIT;
cl_must_pass(git_path_exists(NON_EXISTING_FILEPATH) == false);
- cl_assert_equal_i(GIT_NOTFOUND, git_path_prettify(&p, NON_EXISTING_FILEPATH, NULL));
- cl_assert_equal_i(GIT_NOTFOUND, git_path_prettify(&p, NON_EXISTING_FILEPATH "/so-do-i", NULL));
+ cl_assert_equal_i(GIT_ENOTFOUND, git_path_prettify(&p, NON_EXISTING_FILEPATH, NULL));
+ cl_assert_equal_i(GIT_ENOTFOUND, git_path_prettify(&p, NON_EXISTING_FILEPATH "/so-do-i", NULL));
git_buf_free(&p);
}
View
2 tests-clar/core/vector.c
@@ -143,7 +143,7 @@ static int merge_structs(void **old_raw, void *new)
((my_struct *)old)->count += 1;
git__free(new);
_struct_count--;
- return GIT_EXISTS;
+ return GIT_EEXISTS;
}
static my_struct *alloc_struct(int value)
View
2 tests-clar/index/tests.c
@@ -153,7 +153,7 @@ void test_index_tests__find_in_empty(void)
for (i = 0; i < ARRAY_SIZE(test_entries); ++i) {
int idx = git_index_find(index, test_entries[i].path);
- cl_assert(idx == GIT_NOTFOUND);
+ cl_assert(idx == GIT_ENOTFOUND);
}
git_index_free(index);
View
2 tests-clar/network/remotes.c
@@ -156,7 +156,7 @@ void test_network_remotes__list(void)
void test_network_remotes__loading_a_missing_remote_returns_ENOTFOUND(void)
{
- cl_assert_equal_i(GIT_NOTFOUND, git_remote_load(&_remote, _repo, "just-left-few-minutes-ago"));
+ cl_assert_equal_i(GIT_ENOTFOUND, git_remote_load(&_remote, _repo, "just-left-few-minutes-ago"));
}
void test_network_remotes__add(void)
View
2 tests-clar/notes/notes.c
@@ -127,7 +127,7 @@ void test_notes_notes__retrieving_a_list_of_notes_for_an_unknown_namespace_retur
error = git_note_foreach(_repo, "refs/notes/i-am-not", note_list_cb, &retrieved_notes);
cl_git_fail(error);
- cl_assert_equal_i(GIT_NOTFOUND, error);
+ cl_assert_equal_i(GIT_ENOTFOUND, error);
cl_assert_equal_i(0, retrieved_notes);
}
View
8 tests-clar/object/lookup.c
@@ -22,7 +22,7 @@ void test_object_lookup__lookup_wrong_type_returns_enotfound(void)
cl_git_pass(git_oid_fromstr(&oid, commit));
cl_assert_equal_i(
- GIT_NOTFOUND, git_object_lookup(&object, g_repo, &oid, GIT_OBJ_TAG));
+ GIT_ENOTFOUND, git_object_lookup(&object, g_repo, &oid, GIT_OBJ_TAG));
}
void test_object_lookup__lookup_nonexisting_returns_enotfound(void)
@@ -33,7 +33,7 @@ void test_object_lookup__lookup_nonexisting_returns_enotfound(void)
cl_git_pass(git_oid_fromstr(&oid, unknown));
cl_assert_equal_i(
- GIT_NOTFOUND, git_object_lookup(&object, g_repo, &oid, GIT_OBJ_ANY));
+ GIT_ENOTFOUND, git_object_lookup(&object, g_repo, &oid, GIT_OBJ_ANY));
}
void test_object_lookup__lookup_wrong_type_by_abbreviated_id_returns_enotfound(void)
@@ -44,7 +44,7 @@ void test_object_lookup__lookup_wrong_type_by_abbreviated_id_returns_enotfound(v
cl_git_pass(git_oid_fromstrn(&oid, commit, strlen(commit)));
cl_assert_equal_i(
- GIT_NOTFOUND, git_object_lookup_prefix(&object, g_repo, &oid, strlen(commit), GIT_OBJ_TAG));
+ GIT_ENOTFOUND, git_object_lookup_prefix(&object, g_repo, &oid, strlen(commit), GIT_OBJ_TAG));
}
void test_object_lookup__lookup_wrong_type_eventually_returns_enotfound(void)
@@ -59,5 +59,5 @@ void test_object_lookup__lookup_wrong_type_eventually_returns_enotfound(void)
git_object_free(object);
cl_assert_equal_i(
- GIT_NOTFOUND, git_object_lookup(&object, g_repo, &oid, GIT_OBJ_TAG));
+ GIT_ENOTFOUND, git_object_lookup(&object, g_repo, &oid, GIT_OBJ_TAG));
}
View
4 tests-clar/object/tree/frompath.c
@@ -66,8 +66,8 @@ void test_object_tree_frompath__retrieve_tree_from_path_to_treeentry(void)
void test_object_tree_frompath__fail_when_processing_an_unknown_tree_segment(void)
{
- assert_tree_from_path(tree, "nope/de/fgh/1.txt", GIT_NOTFOUND, NULL);
- assert_tree_from_path(tree, "ab/me-neither/fgh/2.txt", GIT_NOTFOUND, NULL);
+ assert_tree_from_path(tree, "nope/de/fgh/1.txt", GIT_ENOTFOUND, NULL);
+ assert_tree_from_path(tree, "ab/me-neither/fgh/2.txt", GIT_ENOTFOUND, NULL);
}
void test_object_tree_frompath__fail_when_processing_an_invalid_path(void)
View
2 tests-clar/refs/branches/delete.c
@@ -81,7 +81,7 @@ static void assert_non_exisitng_branch_removal(const char *branch_name, git_bran
error = git_branch_delete(repo, branch_name, branch_type);
cl_git_fail(error);
- cl_assert_equal_i(GIT_NOTFOUND, error);
+ cl_assert_equal_i(GIT_ENOTFOUND, error);
}
void test_refs_branches_delete__deleting_a_non_existing_branch_returns_ENOTFOUND(void)
View
2 tests-clar/refs/branches/move.c
@@ -68,5 +68,5 @@ void test_refs_branches_move__moving_a_non_exisiting_branch_returns_ENOTFOUND(vo
error = git_branch_move(repo, "where/am/I", NEW_BRANCH_NAME, 0);
cl_git_fail(error);
- cl_assert_equal_i(GIT_NOTFOUND, error);
+ cl_assert_equal_i(GIT_ENOTFOUND, error);
}
View
10 tests-clar/repo/discover.c
@@ -82,7 +82,7 @@ void test_repo_discover__0(void)
append_ceiling_dir(&ceiling_dirs_buf, TEMP_REPO_FOLDER);
ceiling_dirs = git_buf_cstr(&ceiling_dirs_buf);
- cl_assert_equal_i(GIT_NOTFOUND, git_repository_discover(repository_path, sizeof(repository_path), DISCOVER_FOLDER, 0, ceiling_dirs));
+ cl_assert_equal_i(GIT_ENOTFOUND, git_repository_discover(repository_path, sizeof(repository_path), DISCOVER_FOLDER, 0, ceiling_dirs));
cl_git_pass(git_repository_init(&repo, DISCOVER_FOLDER, 1));
cl_git_pass(git_repository_discover(repository_path, sizeof(repository_path), DISCOVER_FOLDER, 0, ceiling_dirs));
@@ -117,17 +117,17 @@ void test_repo_discover__0(void)
cl_git_fail(git_repository_discover(found_path, sizeof(found_path), ALTERNATE_MALFORMED_FOLDER1, 0, ceiling_dirs));
cl_git_fail(git_repository_discover(found_path, sizeof(found_path), ALTERNATE_MALFORMED_FOLDER2, 0, ceiling_dirs));
cl_git_fail(git_repository_discover(found_path, sizeof(found_path), ALTERNATE_MALFORMED_FOLDER3, 0, ceiling_dirs));
- cl_assert_equal_i(GIT_NOTFOUND, git_repository_discover(found_path, sizeof(found_path), ALTERNATE_NOT_FOUND_FOLDER, 0, ceiling_dirs));
+ cl_assert_equal_i(GIT_ENOTFOUND, git_repository_discover(found_path, sizeof(found_path), ALTERNATE_NOT_FOUND_FOLDER, 0, ceiling_dirs));
append_ceiling_dir(&ceiling_dirs_buf, SUB_REPOSITORY_FOLDER);
ceiling_dirs = git_buf_cstr(&ceiling_dirs_buf);
//this must pass as ceiling_directories cannot predent the current
//working directory to be checked
cl_git_pass(git_repository_discover(found_path, sizeof(found_path), SUB_REPOSITORY_FOLDER, 0, ceiling_dirs));
- cl_assert_equal_i(GIT_NOTFOUND, git_repository_discover(found_path, sizeof(found_path), SUB_REPOSITORY_FOLDER_SUB, 0, ceiling_dirs));
- cl_assert_equal_i(GIT_NOTFOUND, git_repository_discover(found_path, sizeof(found_path), SUB_REPOSITORY_FOLDER_SUB_SUB, 0, ceiling_dirs));
- cl_assert_equal_i(GIT_NOTFOUND, git_repository_discover(found_path, sizeof(found_path), SUB_REPOSITORY_FOLDER_SUB_SUB_SUB, 0, ceiling_dirs));
+ cl_assert_equal_i(GIT_ENOTFOUND, git_repository_discover(found_path, sizeof(found_path), SUB_REPOSITORY_FOLDER_SUB, 0, ceiling_dirs));
+ cl_assert_equal_i(GIT_ENOTFOUND, git_repository_discover(found_path, sizeof(found_path), SUB_REPOSITORY_FOLDER_SUB_SUB, 0, ceiling_dirs));
+ cl_assert_equal_i(GIT_ENOTFOUND, git_repository_discover(found_path, sizeof(found_path), SUB_REPOSITORY_FOLDER_SUB_SUB_SUB, 0, ceiling_dirs));
//.gitfile redirection should not be affected by ceiling directories
ensure_repository_discover(REPOSITORY_ALTERNATE_FOLDER, ceiling_dirs, sub_repository_path);
View
2 tests-clar/repo/open.c
@@ -278,5 +278,5 @@ void test_repo_open__win32_path(void)
void test_repo_open__opening_a_non_existing_repository_returns_ENOTFOUND(void)
{
git_repository *repo;
- cl_assert_equal_i(GIT_NOTFOUND, git_repository_open(&repo, "i-do-not/exist"));
+ cl_assert_equal_i(GIT_ENOTFOUND, git_repository_open(&repo, "i-do-not/exist"));
}
View
2 tests-clar/revwalk/mergebase.c
@@ -63,7 +63,7 @@ void test_revwalk_mergebase__no_common_ancestor_returns_ENOTFOUND(void)
error = git_merge_base(&result, _repo, &one, &two);
cl_git_fail(error);
- cl_assert_equal_i(GIT_NOTFOUND, error);
+ cl_assert_equal_i(GIT_ENOTFOUND, error);
}
/*
View
4 tests-clar/status/submodules.c
@@ -34,9 +34,9 @@ void test_status_submodules__api(void)
{
git_submodule *sm;
- cl_assert(git_submodule_lookup(NULL, g_repo, "nonexistent") == GIT_NOTFOUND);
+ cl_assert(git_submodule_lookup(NULL, g_repo, "nonexistent") == GIT_ENOTFOUND);
- cl_assert(git_submodule_lookup(NULL, g_repo, "modified") == GIT_NOTFOUND);
+ cl_assert(git_submodule_lookup(NULL, g_repo, "modified") == GIT_ENOTFOUND);
cl_git_pass(git_submodule_lookup(&sm, g_repo, "testrepo"));
cl_assert(sm != NULL);
View
8 tests-clar/status/worktree.c
@@ -199,7 +199,7 @@ void test_status_worktree__single_nonexistent_file(void)
error = git_status_file(&status_flags, repo, "nonexistent");
cl_git_fail(error);
- cl_assert(error == GIT_NOTFOUND);
+ cl_assert(error == GIT_ENOTFOUND);
}
/* this test is equivalent to t18-status.c:singlestatus2 */
@@ -211,7 +211,7 @@ void test_status_worktree__single_nonexistent_file_empty_repo(void)
error = git_status_file(&status_flags, repo, "nonexistent");
cl_git_fail(error);
- cl_assert(error == GIT_NOTFOUND);
+ cl_assert(error == GIT_ENOTFOUND);
}
/* this test is equivalent to t18-status.c:singlestatus3 */
@@ -235,7 +235,7 @@ void test_status_worktree__single_folder(void)
error = git_status_file(&status_flags, repo, "subdir");
cl_git_fail(error);
- cl_assert(error != GIT_NOTFOUND);
+ cl_assert(error != GIT_ENOTFOUND);
}
@@ -416,7 +416,7 @@ void test_status_worktree__cannot_retrieve_the_status_of_a_bare_repository(void)
error = git_status_file(&status, repo, "dummy");
cl_git_fail(error);
- cl_assert(error != GIT_NOTFOUND);
+ cl_assert(error != GIT_ENOTFOUND);
git_repository_free(repo);
}

0 comments on commit 904b67e

Please sign in to comment.