proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-08 15:52:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

common: use PRIuZ for size_t in giterr_set calls

Browse Source
This commit is contained in:
Patrick Steinhardt 2016-11-14 10:05:31 +01:00
parent 8effd26f59
commit c77a55a917
5 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/apply.c
View File

@ -173,7 +173,7 @@ static int apply_hunk(
git_diff_line *line = git_array_get(patch->lines, linenum); git_diff_line *line = git_array_get(patch->lines, linenum);
if (!line) { if (!line) {
error = apply_err("Preimage does not contain line %d", linenum); error = apply_err("Preimage does not contain line %"PRIuZ, linenum);
goto done; goto done;
} }

16
src/fetchhead.c
View File

@ -149,7 +149,7 @@ static int fetchhead_ref_parse(
if (!*line) { if (!*line) {
giterr_set(GITERR_FETCHHEAD, giterr_set(GITERR_FETCHHEAD,
"Empty line in FETCH_HEAD line %d", line_num); "Empty line in FETCH_HEAD line %"PRIuZ, line_num);
return -1; return -1;
} }
@ -163,7 +163,7 @@ static int fetchhead_ref_parse(
if (strlen(oid_str) != GIT_OID_HEXSZ) { if (strlen(oid_str) != GIT_OID_HEXSZ) {
giterr_set(GITERR_FETCHHEAD, giterr_set(GITERR_FETCHHEAD,
"Invalid object ID in FETCH_HEAD line %d", line_num); "Invalid object ID in FETCH_HEAD line %"PRIuZ, line_num);
return -1; return -1;
} }
@ -171,7 +171,7 @@ static int fetchhead_ref_parse(
const git_error *oid_err = giterr_last(); const git_error *oid_err = giterr_last();
const char *err_msg = oid_err ? oid_err->message : "Invalid object ID"; const char *err_msg = oid_err ? oid_err->message : "Invalid object ID";
giterr_set(GITERR_FETCHHEAD, "%s in FETCH_HEAD line %d", giterr_set(GITERR_FETCHHEAD, "%s in FETCH_HEAD line %"PRIuZ,
err_msg, line_num); err_msg, line_num);
return -1; return -1;
} }
@ -180,7 +180,7 @@ static int fetchhead_ref_parse(
if (*line) { if (*line) {
if ((is_merge_str = git__strsep(&line, "\t")) == NULL) { if ((is_merge_str = git__strsep(&line, "\t")) == NULL) {
giterr_set(GITERR_FETCHHEAD, giterr_set(GITERR_FETCHHEAD,
"Invalid description data in FETCH_HEAD line %d", line_num); "Invalid description data in FETCH_HEAD line %"PRIuZ, line_num);
return -1; return -1;
} }
@ -190,13 +190,13 @@ static int fetchhead_ref_parse(
*is_merge = 0; *is_merge = 0;
else { else {
giterr_set(GITERR_FETCHHEAD, giterr_set(GITERR_FETCHHEAD,
"Invalid for-merge entry in FETCH_HEAD line %d", line_num); "Invalid for-merge entry in FETCH_HEAD line %"PRIuZ, line_num);
return -1; return -1;
} }
if ((desc = line) == NULL) { if ((desc = line) == NULL) {
giterr_set(GITERR_FETCHHEAD, giterr_set(GITERR_FETCHHEAD,
"Invalid description in FETCH_HEAD line %d", line_num); "Invalid description in FETCH_HEAD line %"PRIuZ, line_num);
return -1; return -1;
} }
@ -213,7 +213,7 @@ static int fetchhead_ref_parse(
if ((desc = strstr(name, "' ")) == NULL || if ((desc = strstr(name, "' ")) == NULL ||
git__prefixcmp(desc, "' of ") != 0) { git__prefixcmp(desc, "' of ") != 0) {
giterr_set(GITERR_FETCHHEAD, giterr_set(GITERR_FETCHHEAD,
"Invalid description in FETCH_HEAD line %d", line_num); "Invalid description in FETCH_HEAD line %"PRIuZ, line_num);
return -1; return -1;
} }
@ -277,7 +277,7 @@ int git_repository_fetchhead_foreach(git_repository *repo,
} }
if (*buffer) { if (*buffer) {
giterr_set(GITERR_FETCHHEAD, "No EOL at line %d", line_num+1); giterr_set(GITERR_FETCHHEAD, "No EOL at line %"PRIuZ, line_num+1);
error = -1; error = -1;
goto done; goto done;
} }

2
src/iterator.c
View File

@ -1311,7 +1311,7 @@ static int filesystem_iterator_frame_push(
if (iter->frames.size == FILESYSTEM_MAX_DEPTH) { if (iter->frames.size == FILESYSTEM_MAX_DEPTH) {
giterr_set(GITERR_REPOSITORY, giterr_set(GITERR_REPOSITORY,
"directory nesting too deep (%d)", iter->frames.size); "directory nesting too deep (%"PRIuZ")", iter->frames.size);
return -1; return -1;
} }

2
src/merge.c
View File

@ -591,7 +591,7 @@ int git_repository_mergehead_foreach(
} }
if (*buffer) { if (*buffer) {
giterr_set(GITERR_MERGE, "No EOL at line %d", line_num); giterr_set(GITERR_MERGE, "No EOL at line %"PRIuZ, line_num);
error = -1; error = -1;
goto cleanup; goto cleanup;
} }

50
src/patch_parse.c
View File

@ -176,7 +176,7 @@ static int parse_header_mode(uint16_t *mode, git_patch_parse_ctx *ctx)
int ret; int ret;
if (ctx->line_len < 1 || !git__isdigit(ctx->line[0])) if (ctx->line_len < 1 || !git__isdigit(ctx->line[0]))
return parse_err("invalid file mode at line %d", ctx->line_num); return parse_err("invalid file mode at line %"PRIuZ, ctx->line_num);
if ((ret = git__strntol32(&m, ctx->line, ctx->line_len, &end, 8)) < 0) if ((ret = git__strntol32(&m, ctx->line, ctx->line_len, &end, 8)) < 0)
return ret; return ret;
@ -205,7 +205,7 @@ static int parse_header_oid(
if (len < GIT_OID_MINPREFIXLEN || len > GIT_OID_HEXSZ || if (len < GIT_OID_MINPREFIXLEN || len > GIT_OID_HEXSZ ||
git_oid_fromstrn(oid, ctx->line, len) < 0) git_oid_fromstrn(oid, ctx->line, len) < 0)
return parse_err("invalid hex formatted object id at line %d", return parse_err("invalid hex formatted object id at line %"PRIuZ,
ctx->line_num); ctx->line_num);
parse_advance_chars(ctx, len); parse_advance_chars(ctx, len);
@ -350,7 +350,7 @@ static int parse_header_similarity(
git_patch_parsed *patch, git_patch_parse_ctx *ctx) git_patch_parsed *patch, git_patch_parse_ctx *ctx)
{ {
if (parse_header_percent(&patch->base.delta->similarity, ctx) < 0) if (parse_header_percent(&patch->base.delta->similarity, ctx) < 0)
return parse_err("invalid similarity percentage at line %d", return parse_err("invalid similarity percentage at line %"PRIuZ,
ctx->line_num); ctx->line_num);
return 0; return 0;
@ -362,7 +362,7 @@ static int parse_header_dissimilarity(
uint16_t dissimilarity; uint16_t dissimilarity;
if (parse_header_percent(&dissimilarity, ctx) < 0) if (parse_header_percent(&dissimilarity, ctx) < 0)
return parse_err("invalid similarity percentage at line %d", return parse_err("invalid similarity percentage at line %"PRIuZ,
ctx->line_num); ctx->line_num);
patch->base.delta->similarity = 100 - dissimilarity; patch->base.delta->similarity = 100 - dissimilarity;
@ -406,15 +406,15 @@ static int parse_header_git(
/* Parse the diff --git line */ /* Parse the diff --git line */
if (parse_advance_expected_str(ctx, "diff --git ") < 0) if (parse_advance_expected_str(ctx, "diff --git ") < 0)
return parse_err("corrupt git diff header at line %d", ctx->line_num); return parse_err("corrupt git diff header at line %"PRIuZ, ctx->line_num);
if (parse_header_path(&patch->header_old_path, ctx) < 0) if (parse_header_path(&patch->header_old_path, ctx) < 0)
return parse_err("corrupt old path in git diff header at line %d", return parse_err("corrupt old path in git diff header at line %"PRIuZ,
ctx->line_num); ctx->line_num);
if (parse_advance_ws(ctx) < 0 || if (parse_advance_ws(ctx) < 0 ||
parse_header_path(&patch->header_new_path, ctx) < 0) parse_header_path(&patch->header_new_path, ctx) < 0)
return parse_err("corrupt new path in git diff header at line %d", return parse_err("corrupt new path in git diff header at line %"PRIuZ,
ctx->line_num); ctx->line_num);
/* Parse remaining header lines */ /* Parse remaining header lines */
@ -447,7 +447,7 @@ static int parse_header_git(
parse_advance_expected_str(ctx, "\n"); parse_advance_expected_str(ctx, "\n");
if (ctx->line_len > 0) { if (ctx->line_len > 0) {
error = parse_err("trailing data at line %d", ctx->line_num); error = parse_err("trailing data at line %"PRIuZ, ctx->line_num);
goto done; goto done;
} }
@ -456,7 +456,7 @@ static int parse_header_git(
} }
if (!found) { if (!found) {
error = parse_err("invalid patch header at line %d", error = parse_err("invalid patch header at line %"PRIuZ,
ctx->line_num); ctx->line_num);
goto done; goto done;
} }
@ -536,7 +536,7 @@ static int parse_hunk_header(
hunk->hunk.header_len = ctx->line - header_start; hunk->hunk.header_len = ctx->line - header_start;
if (hunk->hunk.header_len > (GIT_DIFF_HUNK_HEADER_SIZE - 1)) if (hunk->hunk.header_len > (GIT_DIFF_HUNK_HEADER_SIZE - 1))
return parse_err("oversized patch hunk header at line %d", return parse_err("oversized patch hunk header at line %"PRIuZ,
ctx->line_num); ctx->line_num);
memcpy(hunk->hunk.header, header_start, hunk->hunk.header_len); memcpy(hunk->hunk.header, header_start, hunk->hunk.header_len);
@ -545,7 +545,7 @@ static int parse_hunk_header(
return 0; return 0;
fail: fail:
giterr_set(GITERR_PATCH, "invalid patch hunk header at line %d", giterr_set(GITERR_PATCH, "invalid patch hunk header at line %"PRIuZ,
ctx->line_num); ctx->line_num);
return -1; return -1;
} }
@ -570,7 +570,7 @@ static int parse_hunk_body(
int prefix = 1; int prefix = 1;
if (ctx->line_len == 0 || ctx->line[ctx->line_len - 1] != '\n') { if (ctx->line_len == 0 || ctx->line[ctx->line_len - 1] != '\n') {
error = parse_err("invalid patch instruction at line %d", error = parse_err("invalid patch instruction at line %"PRIuZ,
ctx->line_num); ctx->line_num);
goto done; goto done;
} }
@ -596,7 +596,7 @@ static int parse_hunk_body(
break; break;
default: default:
error = parse_err("invalid patch hunk at line %d", ctx->line_num); error = parse_err("invalid patch hunk at line %"PRIuZ, ctx->line_num);
goto done; goto done;
} }
@ -672,7 +672,7 @@ static int parse_patch_header(
continue; continue;
} }
error = parse_err("invalid hunk header outside patch at line %d", error = parse_err("invalid hunk header outside patch at line %"PRIuZ,
line_num); line_num);
goto done; goto done;
} }
@ -715,12 +715,12 @@ static int parse_patch_binary_side(
parse_advance_chars(ctx, 6); parse_advance_chars(ctx, 6);
} else { } else {
error = parse_err( error = parse_err(
"unknown binary delta type at line %d", ctx->line_num); "unknown binary delta type at line %"PRIuZ, ctx->line_num);
goto done; goto done;
} }
if (parse_number(&len, ctx) < 0 || parse_advance_nl(ctx) < 0 || len < 0) { if (parse_number(&len, ctx) < 0 || parse_advance_nl(ctx) < 0 || len < 0) {
error = parse_err("invalid binary size at line %d", ctx->line_num); error = parse_err("invalid binary size at line %"PRIuZ, ctx->line_num);
goto done; goto done;
} }
@ -736,7 +736,7 @@ static int parse_patch_binary_side(
decoded_len = c - 'a' + (('z' - 'a') + 1) + 1; decoded_len = c - 'a' + (('z' - 'a') + 1) + 1;
if (!decoded_len) { if (!decoded_len) {
error = parse_err("invalid binary length at line %d", ctx->line_num); error = parse_err("invalid binary length at line %"PRIuZ, ctx->line_num);
goto done; goto done;
} }
@ -745,7 +745,7 @@ static int parse_patch_binary_side(
encoded_len = ((decoded_len / 4) + !!(decoded_len % 4)) * 5; encoded_len = ((decoded_len / 4) + !!(decoded_len % 4)) * 5;
if (encoded_len > ctx->line_len - 1) { if (encoded_len > ctx->line_len - 1) {
error = parse_err("truncated binary data at line %d", ctx->line_num); error = parse_err("truncated binary data at line %"PRIuZ, ctx->line_num);
goto done; goto done;
} }
@ -754,14 +754,14 @@ static int parse_patch_binary_side(
goto done; goto done;
if (decoded.size - decoded_orig != decoded_len) { if (decoded.size - decoded_orig != decoded_len) {
error = parse_err("truncated binary data at line %d", ctx->line_num); error = parse_err("truncated binary data at line %"PRIuZ, ctx->line_num);
goto done; goto done;
} }
parse_advance_chars(ctx, encoded_len); parse_advance_chars(ctx, encoded_len);
if (parse_advance_nl(ctx) < 0) { if (parse_advance_nl(ctx) < 0) {
error = parse_err("trailing data at line %d", ctx->line_num); error = parse_err("trailing data at line %"PRIuZ, ctx->line_num);
goto done; goto done;
} }
} }
@ -785,7 +785,7 @@ static int parse_patch_binary(
if (parse_advance_expected_str(ctx, "GIT binary patch") < 0 || if (parse_advance_expected_str(ctx, "GIT binary patch") < 0 ||
parse_advance_nl(ctx) < 0) parse_advance_nl(ctx) < 0)
return parse_err("corrupt git binary header at line %d", ctx->line_num); return parse_err("corrupt git binary header at line %"PRIuZ, ctx->line_num);
/* parse old->new binary diff */ /* parse old->new binary diff */
if ((error = parse_patch_binary_side( if ((error = parse_patch_binary_side(
@ -793,7 +793,7 @@ static int parse_patch_binary(
return error; return error;
if (parse_advance_nl(ctx) < 0) if (parse_advance_nl(ctx) < 0)
return parse_err("corrupt git binary separator at line %d", return parse_err("corrupt git binary separator at line %"PRIuZ,
ctx->line_num); ctx->line_num);
/* parse new->old binary diff */ /* parse new->old binary diff */
@ -802,7 +802,7 @@ static int parse_patch_binary(
return error; return error;
if (parse_advance_nl(ctx) < 0) if (parse_advance_nl(ctx) < 0)
return parse_err("corrupt git binary patch separator at line %d", return parse_err("corrupt git binary patch separator at line %"PRIuZ,
ctx->line_num); ctx->line_num);
patch->base.binary.contains_data = 1; patch->base.binary.contains_data = 1;
@ -820,7 +820,7 @@ static int parse_patch_binary_nodata(
parse_advance_expected_str(ctx, patch->header_new_path) < 0 || parse_advance_expected_str(ctx, patch->header_new_path) < 0 ||
parse_advance_expected_str(ctx, " differ") < 0 || parse_advance_expected_str(ctx, " differ") < 0 ||
parse_advance_nl(ctx) < 0) parse_advance_nl(ctx) < 0)
return parse_err("corrupt git binary header at line %d", ctx->line_num); return parse_err("corrupt git binary header at line %"PRIuZ, ctx->line_num);
patch->base.binary.contains_data = 0; patch->base.binary.contains_data = 0;
patch->base.delta->flags |= GIT_DIFF_FLAG_BINARY; patch->base.delta->flags |= GIT_DIFF_FLAG_BINARY;
@ -912,7 +912,7 @@ static int check_prefix(
if (remain_len || !*path) if (remain_len || !*path)
return parse_err( return parse_err(
"header filename does not contain %d path components", "header filename does not contain %"PRIuZ" path components",
prefix_len); prefix_len);
done: done: