Commit 01ae1909 by Vicent Marti

diff: Cleanup documentation and printf compat

parent 2e4a9ea9
...@@ -455,6 +455,11 @@ GIT_EXTERN(int) git_diff_iterator_next_file( ...@@ -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 * so the first call for a new file is expensive (at least in relative
* terms - in reality, it is still pretty darn fast). * 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 * @param iterator The iterator object
* @return 0 on success, GIT_ITEROVER when done with current file, other * @return 0 on success, GIT_ITEROVER when done with current file, other
* value < 0 on error * value < 0 on error
...@@ -468,8 +473,14 @@ GIT_EXTERN(int) git_diff_iterator_next_hunk( ...@@ -468,8 +473,14 @@ GIT_EXTERN(int) git_diff_iterator_next_hunk(
/** /**
* Return the next line of the current hunk of diffs. * 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 * @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 * value < 0 on error
*/ */
GIT_EXTERN(int) git_diff_iterator_next_line( GIT_EXTERN(int) git_diff_iterator_next_line(
......
...@@ -89,21 +89,21 @@ static int format_hunk_header(char *header, size_t len, git_diff_range *range) ...@@ -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->old_lines != 1) {
if (range->new_lines != 1) if (range->new_lines != 1)
return snprintf( return p_snprintf(
header, len, "@@ -%d,%d +%d,%d @@", header, len, "@@ -%d,%d +%d,%d @@",
range->old_start, range->old_lines, range->old_start, range->old_lines,
range->new_start, range->new_lines); range->new_start, range->new_lines);
else else
return snprintf( return p_snprintf(
header, len, "@@ -%d,%d +%d @@", header, len, "@@ -%d,%d +%d @@",
range->old_start, range->old_lines, range->new_start); range->old_start, range->old_lines, range->new_start);
} else { } else {
if (range->new_lines != 1) if (range->new_lines != 1)
return snprintf( return p_snprintf(
header, len, "@@ -%d +%d,%d @@", header, len, "@@ -%d +%d,%d @@",
range->old_start, range->new_start, range->new_lines); range->old_start, range->new_start, range->new_lines);
else else
return snprintf( return p_snprintf(
header, len, "@@ -%d +%d @@", header, len, "@@ -%d +%d @@",
range->old_start, range->new_start); range->old_start, range->new_start);
} }
......
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