diff options
| author | Vicent Marti <tanoku@gmail.com> | 2012-09-06 10:13:38 +0200 |
|---|---|---|
| committer | Vicent Marti <tanoku@gmail.com> | 2012-09-06 10:13:38 +0200 |
| commit | 01ae1909c59951f2d4f7955090ce7590e62662e8 (patch) | |
| tree | 598077b823b67bd3806067a370fabc1252c6b4e5 | |
| parent | 2e4a9ea9cf8cf12199ea17b0aab50219380b8311 (diff) | |
| download | libgit2-01ae1909c59951f2d4f7955090ce7590e62662e8.tar.gz | |
diff: Cleanup documentation and printf compat
| -rw-r--r-- | include/git2/diff.h | 13 | ||||
| -rw-r--r-- | src/diff_output.c | 8 |
2 files changed, 16 insertions, 5 deletions
diff --git a/include/git2/diff.h b/include/git2/diff.h index d1455061..85bb308d 100644 --- a/include/git2/diff.h +++ b/include/git2/diff.h @@ -455,6 +455,11 @@ GIT_EXTERN(int) git_diff_iterator_next_file( * so the first call for a new file is expensive (at least in relative * terms - in reality, it is still pretty darn fast). * + * @param range Pointer where to store the range for the hunk + * @param header Pointer where to store the header for the chunk; + * this string is owned by the library and should not be freed by + * the user + * @param header_len Pointer where to store the length of the returned header * @param iterator The iterator object * @return 0 on success, GIT_ITEROVER when done with current file, other * value < 0 on error @@ -468,8 +473,14 @@ GIT_EXTERN(int) git_diff_iterator_next_hunk( /** * Return the next line of the current hunk of diffs. * + * @param line_origin Pointer where to store a GIT_DIFF_LINE_ value; + * this value is a single character, not a buffer + * @param content Pointer where to store the content of the line; + * this string is owned by the library and should not be freed by + * the user + * @param Pointer where to store the length of the returned content * @param iterator The iterator object - * @return 0 on success, GIT_ITEROVER when done with current hunk, other + * @return 0 on success, GIT_ITEROVER when done with current line, other * value < 0 on error */ GIT_EXTERN(int) git_diff_iterator_next_line( diff --git a/src/diff_output.c b/src/diff_output.c index d715f9ef..2c64b92e 100644 --- a/src/diff_output.c +++ b/src/diff_output.c @@ -89,21 +89,21 @@ static int format_hunk_header(char *header, size_t len, git_diff_range *range) { if (range->old_lines != 1) { if (range->new_lines != 1) - return snprintf( + return p_snprintf( header, len, "@@ -%d,%d +%d,%d @@", range->old_start, range->old_lines, range->new_start, range->new_lines); else - return snprintf( + return p_snprintf( header, len, "@@ -%d,%d +%d @@", range->old_start, range->old_lines, range->new_start); } else { if (range->new_lines != 1) - return snprintf( + return p_snprintf( header, len, "@@ -%d +%d,%d @@", range->old_start, range->new_start, range->new_lines); else - return snprintf( + return p_snprintf( header, len, "@@ -%d +%d @@", range->old_start, range->new_start); } |