diff options
| author | nulltoken <emeric.fermas@gmail.com> | 2012-08-21 11:45:16 +0200 |
|---|---|---|
| committer | nulltoken <emeric.fermas@gmail.com> | 2012-08-21 23:15:13 +0200 |
| commit | 9d7ac675d06dab2e000ad32f9248631af0191f85 (patch) | |
| tree | 9e32cfadd2e1ffaa05f72dd5871551180ee0afb9 /src | |
| parent | a7dbac0b2372f9dd1af01ae058ec764d3979991f (diff) | |
| download | libgit2-9d7ac675d06dab2e000ad32f9248631af0191f85.tar.gz | |
tree entry: rename git_tree_entry_attributes() into git_tree_entry_filemode()
Diffstat (limited to 'src')
| -rw-r--r-- | src/checkout.c | 4 | ||||
| -rw-r--r-- | src/notes.c | 2 | ||||
| -rw-r--r-- | src/tree.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/checkout.c b/src/checkout.c index 252d9c4ae..ac540391e 100644 --- a/src/checkout.c +++ b/src/checkout.c @@ -88,7 +88,7 @@ static int blob_contents_to_file(git_repository *repo, git_buf *fnbuf, /* Allow overriding of file mode */ if (!file_mode) - file_mode = git_tree_entry_attributes(entry); + file_mode = git_tree_entry_filemode(entry); if ((retcode = git_futils_mkpath2file(git_buf_cstr(fnbuf), data->opts->dir_mode)) < 0) goto bctf_cleanup; @@ -111,7 +111,7 @@ static int checkout_walker(const char *path, const git_tree_entry *entry, void * { int retcode = 0; tree_walk_data *data = (tree_walk_data*)payload; - int attr = git_tree_entry_attributes(entry); + int attr = git_tree_entry_filemode(entry); git_buf fnbuf = GIT_BUF_INIT; git_buf_join_n(&fnbuf, '/', 3, git_repository_workdir(data->repo), diff --git a/src/notes.c b/src/notes.c index b592a2cd3..81e4e5073 100644 --- a/src/notes.c +++ b/src/notes.c @@ -33,7 +33,7 @@ static int find_subtree_in_current_level( if (!git__ishex(git_tree_entry_name(entry))) continue; - if (S_ISDIR(git_tree_entry_attributes(entry)) + if (S_ISDIR(git_tree_entry_filemode(entry)) && strlen(git_tree_entry_name(entry)) == 2 && !strncmp(git_tree_entry_name(entry), annotated_object_sha + fanout, 2)) return git_tree_lookup(out, repo, git_tree_entry_id(entry)); diff --git a/src/tree.c b/src/tree.c index 315269d5d..83aa303d4 100644 --- a/src/tree.c +++ b/src/tree.c @@ -185,9 +185,9 @@ const git_oid *git_tree_id(git_tree *c) return git_object_id((git_object *)c); } -unsigned int git_tree_entry_attributes(const git_tree_entry *entry) +git_filemode_t git_tree_entry_filemode(const git_tree_entry *entry) { - return entry->attr; + return (git_filemode_t)entry->attr; } const char *git_tree_entry_name(const git_tree_entry *entry) |