diff options
| author | Vicent Martà <tanoku@gmail.com> | 2011-12-31 05:56:39 +0100 |
|---|---|---|
| committer | Vicent Martà <tanoku@gmail.com> | 2011-12-31 05:58:26 +0100 |
| commit | 9dd4c3e80690ec08eba604e5218d0f4abb8f1a02 (patch) | |
| tree | 988b94bf2bad8992d1abbe42ee936dff5cad6cf8 | |
| parent | 06fcf057b6da37ffd388e4a31c2671b20d0dd21e (diff) | |
| download | libgit2-9dd4c3e80690ec08eba604e5218d0f4abb8f1a02.tar.gz | |
config: Rename the `delete` callback name
`delete` is a reserved keyword in C++.
| -rw-r--r-- | include/git2/config.h | 2 | ||||
| -rw-r--r-- | src/config.c | 2 | ||||
| -rw-r--r-- | src/config_file.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/git2/config.h b/include/git2/config.h index f78fe40a0..ffafd7959 100644 --- a/include/git2/config.h +++ b/include/git2/config.h @@ -30,7 +30,7 @@ struct git_config_file { int (*open)(struct git_config_file *); int (*get)(struct git_config_file *, const char *key, const char **value); int (*set)(struct git_config_file *, const char *key, const char *value); - int (*delete)(struct git_config_file *, const char *key); + int (*del)(struct git_config_file *, const char *key); int (*foreach)(struct git_config_file *, int (*fn)(const char *, const char *, void *), void *data); void (*free)(struct git_config_file *); }; diff --git a/src/config.c b/src/config.c index ed7c947ed..f8ff05056 100644 --- a/src/config.c +++ b/src/config.c @@ -171,7 +171,7 @@ int git_config_delete(git_config *cfg, const char *name) internal = git_vector_get(&cfg->files, 0); file = internal->file; - return file->delete(file, name); + return file->del(file, name); } /************** diff --git a/src/config_file.c b/src/config_file.c index afa917a0b..135871950 100644 --- a/src/config_file.c +++ b/src/config_file.c @@ -452,7 +452,7 @@ int git_config_file__ondisk(git_config_file **out, const char *path) backend->parent.open = config_open; backend->parent.get = config_get; backend->parent.set = config_set; - backend->parent.delete = config_delete; + backend->parent.del = config_delete; backend->parent.foreach = file_foreach; backend->parent.free = backend_free; |