Commit a9d6b9d5 by Edward Thomson Committed by GitHub

Merge pull request #4304 from pks-t/pks/patch-buffers

patch_generate: represent buffers as void pointers
parents dca8c44f 9093ced6
...@@ -96,7 +96,7 @@ GIT_EXTERN(int) git_patch_from_blob_and_buffer( ...@@ -96,7 +96,7 @@ GIT_EXTERN(int) git_patch_from_blob_and_buffer(
git_patch **out, git_patch **out,
const git_blob *old_blob, const git_blob *old_blob,
const char *old_as_path, const char *old_as_path,
const char *buffer, const void *buffer,
size_t buffer_len, size_t buffer_len,
const char *buffer_as_path, const char *buffer_as_path,
const git_diff_options *opts); const git_diff_options *opts);
...@@ -124,7 +124,7 @@ GIT_EXTERN(int) git_patch_from_buffers( ...@@ -124,7 +124,7 @@ GIT_EXTERN(int) git_patch_from_buffers(
const void *old_buffer, const void *old_buffer,
size_t old_len, size_t old_len,
const char *old_as_path, const char *old_as_path,
const char *new_buffer, const void *new_buffer,
size_t new_len, size_t new_len,
const char *new_as_path, const char *new_as_path,
const git_diff_options *opts); const git_diff_options *opts);
......
...@@ -641,7 +641,7 @@ int git_patch_from_blob_and_buffer( ...@@ -641,7 +641,7 @@ int git_patch_from_blob_and_buffer(
git_patch **out, git_patch **out,
const git_blob *old_blob, const git_blob *old_blob,
const char *old_path, const char *old_path,
const char *buf, const void *buf,
size_t buflen, size_t buflen,
const char *buf_path, const char *buf_path,
const git_diff_options *opts) const git_diff_options *opts)
...@@ -680,7 +680,7 @@ int git_patch_from_buffers( ...@@ -680,7 +680,7 @@ int git_patch_from_buffers(
const void *old_buf, const void *old_buf,
size_t old_len, size_t old_len,
const char *old_path, const char *old_path,
const char *new_buf, const void *new_buf,
size_t new_len, size_t new_len,
const char *new_path, const char *new_path,
const git_diff_options *opts) const git_diff_options *opts)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment