From: Martin Koegler <martin.koegler@xxxxxxxxx> Signed-off-by: Martin Koegler <martin.koegler@xxxxxxxxx> --- ref-filter.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/ref-filter.c b/ref-filter.c index 5c903a5..30f249c 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -724,7 +724,7 @@ static int grab_objectname(const char *name, const unsigned char *sha1, } /* See grab_values */ -static void grab_common_values(struct atom_value *val, int deref, struct object *obj, void *buf, unsigned long sz) +static void grab_common_values(struct atom_value *val, int deref, struct object *obj, void *buf, size_t sz) { int i; @@ -739,7 +739,7 @@ static void grab_common_values(struct atom_value *val, int deref, struct object v->s = typename(obj->type); else if (!strcmp(name, "objectsize")) { v->value = sz; - v->s = xstrfmt("%lu", sz); + v->s = xstrfmt("%" PRIuMAX, (uintmax_t)sz); } else if (deref) grab_objectname(name, obj->oid.hash, v, &used_atom[i]); @@ -747,7 +747,7 @@ static void grab_common_values(struct atom_value *val, int deref, struct object } /* See grab_values */ -static void grab_tag_values(struct atom_value *val, int deref, struct object *obj, void *buf, unsigned long sz) +static void grab_tag_values(struct atom_value *val, int deref, struct object *obj, void *buf, size_t sz) { int i; struct tag *tag = (struct tag *) obj; @@ -769,7 +769,7 @@ static void grab_tag_values(struct atom_value *val, int deref, struct object *ob } /* See grab_values */ -static void grab_commit_values(struct atom_value *val, int deref, struct object *obj, void *buf, unsigned long sz) +static void grab_commit_values(struct atom_value *val, int deref, struct object *obj, void *buf, size_t sz) { int i; struct commit *commit = (struct commit *) obj; @@ -786,7 +786,7 @@ static void grab_commit_values(struct atom_value *val, int deref, struct object } else if (!strcmp(name, "numparent")) { v->value = commit_list_count(commit->parents); - v->s = xstrfmt("%lu", (unsigned long)v->value); + v->s = xstrfmt("%" PRIuMAX, (uintmax_t)v->value); } else if (!strcmp(name, "parent")) { struct commit_list *parents; @@ -802,7 +802,7 @@ static void grab_commit_values(struct atom_value *val, int deref, struct object } } -static const char *find_wholine(const char *who, int wholen, const char *buf, unsigned long sz) +static const char *find_wholine(const char *who, int wholen, const char *buf, size_t sz) { const char *eol; while (*buf) { @@ -848,7 +848,7 @@ static const char *copy_email(const char *buf) return xmemdupz(email, eoemail + 1 - email); } -static char *copy_subject(const char *buf, unsigned long len) +static char *copy_subject(const char *buf, size_t len) { char *r = xmemdupz(buf, len); int i; @@ -898,7 +898,7 @@ static void grab_date(const char *buf, struct atom_value *v, const char *atomnam } /* See grab_values */ -static void grab_person(const char *who, struct atom_value *val, int deref, struct object *obj, void *buf, unsigned long sz) +static void grab_person(const char *who, struct atom_value *val, int deref, struct object *obj, void *buf, size_t sz) { int i; int wholen = strlen(who); @@ -957,11 +957,11 @@ static void grab_person(const char *who, struct atom_value *val, int deref, stru } } -static void find_subpos(const char *buf, unsigned long sz, - const char **sub, unsigned long *sublen, - const char **body, unsigned long *bodylen, - unsigned long *nonsiglen, - const char **sig, unsigned long *siglen) +static void find_subpos(const char *buf, size_t sz, + const char **sub, size_t *sublen, + const char **body, size_t *bodylen, + size_t *nonsiglen, + const char **sig, size_t *siglen) { const char *eol; /* skip past header until we hit empty line */ @@ -1005,7 +1005,7 @@ static void find_subpos(const char *buf, unsigned long sz, * If 'lines' is greater than 0, append that many lines from the given * 'buf' of length 'size' to the given strbuf. */ -static void append_lines(struct strbuf *out, const char *buf, unsigned long size, int lines) +static void append_lines(struct strbuf *out, const char *buf, size_t size, int lines) { int i; const char *sp, *eol; @@ -1026,11 +1026,11 @@ static void append_lines(struct strbuf *out, const char *buf, unsigned long size } /* See grab_values */ -static void grab_sub_body_contents(struct atom_value *val, int deref, struct object *obj, void *buf, unsigned long sz) +static void grab_sub_body_contents(struct atom_value *val, int deref, struct object *obj, void *buf, size_t sz) { int i; const char *subpos = NULL, *bodypos = NULL, *sigpos = NULL; - unsigned long sublen = 0, bodylen = 0, nonsiglen = 0, siglen = 0; + size_t sublen = 0, bodylen = 0, nonsiglen = 0, siglen = 0; for (i = 0; i < used_atom_cnt; i++) { struct used_atom *atom = &used_atom[i]; @@ -1100,7 +1100,7 @@ static void fill_missing_values(struct atom_value *val) * pointed at by the ref itself; otherwise it is the object the * ref (which is a tag) refers to. */ -static void grab_values(struct atom_value *val, int deref, struct object *obj, void *buf, unsigned long sz) +static void grab_values(struct atom_value *val, int deref, struct object *obj, void *buf, size_t sz) { grab_common_values(val, deref, obj, buf, sz); switch (obj->type) { -- 2.1.4