diff options
Diffstat (limited to 'src/merge_driver.c')
| -rw-r--r-- | src/merge_driver.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/merge_driver.c b/src/merge_driver.c index ea4bd2787..8b7e3559a 100644 --- a/src/merge_driver.c +++ b/src/merge_driver.c @@ -181,7 +181,7 @@ static int merge_driver_registry_insert( git_merge_driver_entry *entry; entry = git__calloc(1, sizeof(git_merge_driver_entry) + strlen(name) + 1); - GITERR_CHECK_ALLOC(entry); + GIT_ERROR_CHECK_ALLOC(entry); strcpy(entry->name, name); entry->driver = driver; @@ -265,12 +265,12 @@ int git_merge_driver_register(const char *name, git_merge_driver *driver) assert(name && driver); if (git_rwlock_wrlock(&merge_driver_registry.lock) < 0) { - giterr_set(GITERR_OS, "failed to lock merge driver registry"); + git_error_set(GIT_ERROR_OS, "failed to lock merge driver registry"); return -1; } if (!merge_driver_registry_find(NULL, name)) { - giterr_set(GITERR_MERGE, "attempt to reregister existing driver '%s'", + git_error_set(GIT_ERROR_MERGE, "attempt to reregister existing driver '%s'", name); error = GIT_EEXISTS; goto done; @@ -290,12 +290,12 @@ int git_merge_driver_unregister(const char *name) int error = 0; if (git_rwlock_wrlock(&merge_driver_registry.lock) < 0) { - giterr_set(GITERR_OS, "failed to lock merge driver registry"); + git_error_set(GIT_ERROR_OS, "failed to lock merge driver registry"); return -1; } if ((entry = merge_driver_registry_lookup(&pos, name)) == NULL) { - giterr_set(GITERR_MERGE, "cannot find merge driver '%s' to unregister", + git_error_set(GIT_ERROR_MERGE, "cannot find merge driver '%s' to unregister", name); error = GIT_ENOTFOUND; goto done; @@ -332,7 +332,7 @@ git_merge_driver *git_merge_driver_lookup(const char *name) return &git_merge_driver__binary; if (git_rwlock_rdlock(&merge_driver_registry.lock) < 0) { - giterr_set(GITERR_OS, "failed to lock merge driver registry"); + git_error_set(GIT_ERROR_OS, "failed to lock merge driver registry"); return NULL; } @@ -341,7 +341,7 @@ git_merge_driver *git_merge_driver_lookup(const char *name) git_rwlock_rdunlock(&merge_driver_registry.lock); if (entry == NULL) { - giterr_set(GITERR_MERGE, "cannot use an unregistered filter"); + git_error_set(GIT_ERROR_MERGE, "cannot use an unregistered filter"); return NULL; } |