diff options
| author | Vicent Martà <vicent@github.com> | 2013-11-01 09:31:52 -0700 |
|---|---|---|
| committer | Vicent Martà <vicent@github.com> | 2013-11-01 09:31:52 -0700 |
| commit | ac5e507cec8e075a2095abcf4c8c82a01b82a5f9 (patch) | |
| tree | b71b4da51ff96c0b1fdf0330a9b9b21a98afe59c /include | |
| parent | b22593fb6444f4469445e1af2a786c8d13ee4828 (diff) | |
| parent | a6154f2183043626cdbe995b4795346610b5862e (diff) | |
| download | libgit2-ac5e507cec8e075a2095abcf4c8c82a01b82a5f9.tar.gz | |
Merge pull request #1918 from libgit2/cmn/indexer-naming
indexer: remove the stream infix
Diffstat (limited to 'include')
| -rw-r--r-- | include/git2/indexer.h | 16 | ||||
| -rw-r--r-- | include/git2/odb_backend.h | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/include/git2/indexer.h b/include/git2/indexer.h index 0858b6ea1..fb55672a9 100644 --- a/include/git2/indexer.h +++ b/include/git2/indexer.h @@ -13,10 +13,10 @@ GIT_BEGIN_DECL -typedef struct git_indexer_stream git_indexer_stream; +typedef struct git_indexer git_indexer; /** - * Create a new streaming indexer instance + * Create a new indexer instance * * @param out where to store the indexer instance * @param path to the directory where the packfile should be stored @@ -26,8 +26,8 @@ typedef struct git_indexer_stream git_indexer_stream; * @param progress_cb function to call with progress information * @param progress_cb_payload payload for the progress callback */ -GIT_EXTERN(int) git_indexer_stream_new( - git_indexer_stream **out, +GIT_EXTERN(int) git_indexer_new( + git_indexer **out, const char *path, git_odb *odb, git_transfer_progress_callback progress_cb, @@ -41,7 +41,7 @@ GIT_EXTERN(int) git_indexer_stream_new( * @param size the size of the data in bytes * @param stats stat storage */ -GIT_EXTERN(int) git_indexer_stream_add(git_indexer_stream *idx, const void *data, size_t size, git_transfer_progress *stats); +GIT_EXTERN(int) git_indexer_append(git_indexer *idx, const void *data, size_t size, git_transfer_progress *stats); /** * Finalize the pack and index @@ -50,7 +50,7 @@ GIT_EXTERN(int) git_indexer_stream_add(git_indexer_stream *idx, const void *data * * @param idx the indexer */ -GIT_EXTERN(int) git_indexer_stream_finalize(git_indexer_stream *idx, git_transfer_progress *stats); +GIT_EXTERN(int) git_indexer_commit(git_indexer *idx, git_transfer_progress *stats); /** * Get the packfile's hash @@ -60,14 +60,14 @@ GIT_EXTERN(int) git_indexer_stream_finalize(git_indexer_stream *idx, git_transfe * * @param idx the indexer instance */ -GIT_EXTERN(const git_oid *) git_indexer_stream_hash(const git_indexer_stream *idx); +GIT_EXTERN(const git_oid *) git_indexer_hash(const git_indexer *idx); /** * Free the indexer and its resources * * @param idx the indexer to free */ -GIT_EXTERN(void) git_indexer_stream_free(git_indexer_stream *idx); +GIT_EXTERN(void) git_indexer_free(git_indexer *idx); GIT_END_DECL diff --git a/include/git2/odb_backend.h b/include/git2/odb_backend.h index a6cb285dc..1b3e2fd12 100644 --- a/include/git2/odb_backend.h +++ b/include/git2/odb_backend.h @@ -116,7 +116,7 @@ struct git_odb_stream { struct git_odb_writepack { git_odb_backend *backend; - int (*add)(git_odb_writepack *writepack, const void *data, size_t size, git_transfer_progress *stats); + int (*append)(git_odb_writepack *writepack, const void *data, size_t size, git_transfer_progress *stats); int (*commit)(git_odb_writepack *writepack, git_transfer_progress *stats); void (*free)(git_odb_writepack *writepack); }; |