summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell Belfer <rb@github.com>2013-09-24 09:30:02 -0700
committerRussell Belfer <rb@github.com>2013-09-24 09:30:02 -0700
commitd89b8b60d1ac49f0147c18db1ce935bf6155ff45 (patch)
tree76af30c252afaf9409e0bd8d6c54a978cc3e6419
parent10edb7a92a6d9b886f3dea083dba0aaba1851200 (diff)
parente3f3868a1c4ced6109cbd4644cb1e3e8e9d8a5e9 (diff)
downloadlibgit2-d89b8b60d1ac49f0147c18db1ce935bf6155ff45.tar.gz
Merge pull request #1867 from ethomson/remove_not_delete
'del' instead of 'delete' for the poor C++ users
-rw-r--r--include/git2/sys/refdb_backend.h2
-rw-r--r--src/refdb.c2
-rw-r--r--src/refdb_fs.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/include/git2/sys/refdb_backend.h b/include/git2/sys/refdb_backend.h
index 9b457b074..e0a24f433 100644
--- a/include/git2/sys/refdb_backend.h
+++ b/include/git2/sys/refdb_backend.h
@@ -103,7 +103,7 @@ struct git_refdb_backend {
* Deletes the given reference from the refdb. A refdb implementation
* must provide this function.
*/
- int (*delete)(git_refdb_backend *backend, const char *ref_name);
+ int (*del)(git_refdb_backend *backend, const char *ref_name);
/**
* Suggests that the given refdb compress or optimize its references.
diff --git a/src/refdb.c b/src/refdb.c
index 4de7188b2..7df61a577 100644
--- a/src/refdb.c
+++ b/src/refdb.c
@@ -201,5 +201,5 @@ int git_refdb_rename(
int git_refdb_delete(struct git_refdb *db, const char *ref_name)
{
assert(db && db->backend);
- return db->backend->delete(db->backend, ref_name);
+ return db->backend->del(db->backend, ref_name);
}
diff --git a/src/refdb_fs.c b/src/refdb_fs.c
index 894ff7c84..0ba711eb7 100644
--- a/src/refdb_fs.c
+++ b/src/refdb_fs.c
@@ -1096,7 +1096,7 @@ int git_refdb_backend_fs(
backend->parent.lookup = &refdb_fs_backend__lookup;
backend->parent.iterator = &refdb_fs_backend__iterator;
backend->parent.write = &refdb_fs_backend__write;
- backend->parent.delete = &refdb_fs_backend__delete;
+ backend->parent.del = &refdb_fs_backend__delete;
backend->parent.rename = &refdb_fs_backend__rename;
backend->parent.compress = &refdb_fs_backend__compress;
backend->parent.free = &refdb_fs_backend__free;