[PATCH 5/9] Convert various things to size_t

2017-08-12 Thread Martin Koegler 
From: Martin Koegler 

---
 bisect.c| 2 +-
 blame.c | 2 +-
 builtin/fmt-merge-msg.c | 2 +-
 builtin/mktag.c | 2 +-
 dir.c   | 4 ++--
 dir.h   | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bisect.c b/bisect.c
index 2549eaf..0580c82 100644
--- a/bisect.c
+++ b/bisect.c
@@ -131,7 +131,7 @@ static void show_list(const char *debug, int counted, int 
nr,
struct commit *commit = p->item;
unsigned flags = commit->object.flags;
enum object_type type;
-   unsigned long size;
+   size_t size;
char *buf = read_sha1_file(commit->object.sha1, &type, &size);
const char *subject_start;
int subject_len;
diff --git a/blame.c b/blame.c
index 739a280..f628b42 100644
--- a/blame.c
+++ b/blame.c
@@ -1621,7 +1621,7 @@ static const char *get_next_line(const char *start, const 
char *end)
 static int prepare_lines(struct blame_scoreboard *sb)
 {
const char *buf = sb->final_buf;
-   unsigned long len = sb->final_buf_size;
+   size_t len = sb->final_buf_size;
const char *end = buf + len;
const char *p;
int *lineno;
diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c
index 61ab796..3faf100 100644
--- a/builtin/fmt-merge-msg.c
+++ b/builtin/fmt-merge-msg.c
@@ -464,7 +464,7 @@ static void fmt_merge_msg_title(struct strbuf *out,
 static void fmt_tag_signature(struct strbuf *tagbuf,
  struct strbuf *sig,
  const char *buf,
- unsigned long len)
+ size_t len)
 {
const char *tag_body = strstr(buf, "\n\n");
if (tag_body) {
diff --git a/builtin/mktag.c b/builtin/mktag.c
index 0663106..ff919a7 100644
--- a/builtin/mktag.c
+++ b/builtin/mktag.c
@@ -34,7 +34,7 @@ static int verify_object(const unsigned char *sha1, const 
char *expected_type)
return ret;
 }
 
-static int verify_tag(char *buffer, unsigned long size)
+static int verify_tag(char *buffer, size_t size)
 {
int typelen;
char type[20];
diff --git a/dir.c b/dir.c
index f161c26..0c7c767 100644
--- a/dir.c
+++ b/dir.c
@@ -180,7 +180,7 @@ static size_t common_prefix_len(const struct pathspec 
*pathspec)
  */
 char *common_prefix(const struct pathspec *pathspec)
 {
-   unsigned long len = common_prefix_len(pathspec);
+   size_t len = common_prefix_len(pathspec);
 
return len ? xmemdupz(pathspec->items[0].match, len) : NULL;
 }
@@ -2673,7 +2673,7 @@ static void load_sha1_stat(struct sha1_stat *sha1_stat,
sha1_stat->valid = 1;
 }
 
-struct untracked_cache *read_untracked_extension(const void *data, unsigned 
long sz)
+struct untracked_cache *read_untracked_extension(const void *data, size_t sz)
 {
struct untracked_cache *uc;
struct read_data rd;
diff --git a/dir.h b/dir.h
index e371705..709c72c 100644
--- a/dir.h
+++ b/dir.h
@@ -349,7 +349,7 @@ void untracked_cache_remove_from_index(struct index_state 
*, const char *);
 void untracked_cache_add_to_index(struct index_state *, const char *);
 
 void free_untracked_cache(struct untracked_cache *);
-struct untracked_cache *read_untracked_extension(const void *data, unsigned 
long sz);
+struct untracked_cache *read_untracked_extension(const void *data, size_t sz);
 void write_untracked_extension(struct strbuf *out, struct untracked_cache 
*untracked);
 void add_untracked_cache(struct index_state *istate);
 void remove_untracked_cache(struct index_state *istate);
-- 
2.1.4

Re: [PATCH 5/9] Convert various things to size_t

2017-08-12 Thread Martin Ågren 
On 12 August 2017 at 10:47, Martin Koegler  wrote:
> From: Martin Koegler 
>
> ---
>  bisect.c| 2 +-
>  blame.c | 2 +-
>  builtin/fmt-merge-msg.c | 2 +-
>  builtin/mktag.c | 2 +-
>  dir.c   | 4 ++--
>  dir.h   | 2 +-
>  6 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/bisect.c b/bisect.c
> index 2549eaf..0580c82 100644
> --- a/bisect.c
> +++ b/bisect.c
> @@ -131,7 +131,7 @@ static void show_list(const char *debug, int counted, int 
> nr,
> struct commit *commit = p->item;
> unsigned flags = commit->object.flags;
> enum object_type type;
> -   unsigned long size;
> +   size_t size;
> char *buf = read_sha1_file(commit->object.sha1, &type, &size);
> const char *subject_start;
> int subject_len;

Would this need to be done in a patch where read_sha1_file is converted?

Re: [PATCH 5/9] Convert various things to size_t

2017-08-13 Thread Martin Koegler 
On Sat, Aug 12, 2017 at 03:27:21PM +0200, Martin Ågren wrote:
> On 12 August 2017 at 10:47, Martin Koegler  wrote:
> > From: Martin Koegler 
> >
> > ---
> >  bisect.c| 2 +-
> >  blame.c | 2 +-
> >  builtin/fmt-merge-msg.c | 2 +-
> >  builtin/mktag.c | 2 +-
> >  dir.c   | 4 ++--
> >  dir.h   | 2 +-
> >  6 files changed, 7 insertions(+), 7 deletions(-)
> >
> > diff --git a/bisect.c b/bisect.c
> > index 2549eaf..0580c82 100644
> > --- a/bisect.c
> > +++ b/bisect.c
> > @@ -131,7 +131,7 @@ static void show_list(const char *debug, int counted, 
> > int nr,
> > struct commit *commit = p->item;
> > unsigned flags = commit->object.flags;
> > enum object_type type;
> > -   unsigned long size;
> > +   size_t size;
> > char *buf = read_sha1_file(commit->object.sha1, &type, 
> > &size);
> > const char *subject_start;
> > int subject_len;
> 
> Would this need to be done in a patch where read_sha1_file is converted?

I missed this first, because it is debug code requiring a code change to be 
enabled. 

It probably should be merged in my second patch. On the other hand that patch 
is already considered too large.

Regards,
Martin