diff mbox series

[Outreachy] bisect--helper: convert `*_warning` char pointers to char arrays.

Message ID 20191213115225.13291-1-mirucam@gmail.com (mailing list archive)
State New, archived
Headers show
Series [Outreachy] bisect--helper: convert `*_warning` char pointers to char arrays. | expand

Commit Message

Miriam R. Dec. 13, 2019, 11:52 a.m. UTC
From: Tanushree Tumane <tanushreetumane@gmail.com>

A char array creates a character array. Its size is the number
of elements plus one (compiler automatically adds '\0').
A char pointer creates a char array and a pointer to that char
array that means four extra for bytes for the pointer variable.

Let's convert `need_bad_and_good_revision_warning` and
`need_bisect_start_warning` char pointers to char arrays.

Mentored-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Tanushree Tumane <tanushreetumane@gmail.com>
Signed-off-by: Miriam Rubio <mirucam@gmail.com>
---
This patch is a new version of:
https://public-inbox.org/git/cadc46442d5c960caa58227092289fa2f44fb96f.1551003074.git.gitgitgadget@gmail.com/
sent previously by Tanushree.

 builtin/bisect--helper.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Junio C Hamano Dec. 13, 2019, 7:57 p.m. UTC | #1
Miriam Rubio <mirucam@gmail.com> writes:

> From: Tanushree Tumane <tanushreetumane@gmail.com>
>
> A char array creates a character array. Its size is the number
> of elements plus one (compiler automatically adds '\0').
> A char pointer creates a char array and a pointer to that char
> array that means four extra for bytes for the pointer variable.

This depends on the word size of your pointer and many people have
8-byte pointers these days.  Just say

	Instead of using a pointer that points at a constant string,
	just give name directly to the constant string; this way, we
	do not have to allocate a pointer variable in addition to
	the string we want to use.

or something.

> Let's convert `need_bad_and_good_revision_warning` and
> `need_bisect_start_warning` char pointers to char arrays.
>
> Mentored-by: Christian Couder <chriscool@tuxfamily.org>
> Signed-off-by: Tanushree Tumane <tanushreetumane@gmail.com>
> Signed-off-by: Miriam Rubio <mirucam@gmail.com>
> ---
> This patch is a new version of:
> https://public-inbox.org/git/cadc46442d5c960caa58227092289fa2f44fb96f.1551003074.git.gitgitgadget@gmail.com/
> sent previously by Tanushree.
>
>  builtin/bisect--helper.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
> index 3055b2bb50..1718df7f09 100644
> --- a/builtin/bisect--helper.c
> +++ b/builtin/bisect--helper.c
> @@ -282,11 +282,11 @@ static int mark_good(const char *refname, const struct object_id *oid,
>  	return 1;
>  }
>  
> -static const char *need_bad_and_good_revision_warning =
> +static const char need_bad_and_good_revision_warning[] =
>  	N_("You need to give me at least one %s and %s revision.\n"
>  	   "You can use \"git bisect %s\" and \"git bisect %s\" for that.");
>  
> -static const char *need_bisect_start_warning =
> +static const char need_bisect_start_warning[] =
>  	N_("You need to start by \"git bisect start\".\n"
>  	   "You then need to give me at least one %s and %s revision.\n"
>  	   "You can use \"git bisect %s\" and \"git bisect %s\" for that.");
Miriam R. Dec. 14, 2019, 8:09 a.m. UTC | #2
El vie., 13 dic. 2019 a las 20:57, Junio C Hamano
(<gitster@pobox.com>) escribió:
>
> Miriam Rubio <mirucam@gmail.com> writes:
>
> > From: Tanushree Tumane <tanushreetumane@gmail.com>
> >
> > A char array creates a character array. Its size is the number
> > of elements plus one (compiler automatically adds '\0').
> > A char pointer creates a char array and a pointer to that char
> > array that means four extra for bytes for the pointer variable.
>
> This depends on the word size of your pointer and many people have
> 8-byte pointers these days.  Just say
>
>         Instead of using a pointer that points at a constant string,
>         just give name directly to the constant string; this way, we
>         do not have to allocate a pointer variable in addition to
>         the string we want to use.
>
> or something.

Ok, thank you, Junio. I'll send another version with the changes.

>
> > Let's convert `need_bad_and_good_revision_warning` and
> > `need_bisect_start_warning` char pointers to char arrays.
> >
> > Mentored-by: Christian Couder <chriscool@tuxfamily.org>
> > Signed-off-by: Tanushree Tumane <tanushreetumane@gmail.com>
> > Signed-off-by: Miriam Rubio <mirucam@gmail.com>
> > ---
> > This patch is a new version of:
> > https://public-inbox.org/git/cadc46442d5c960caa58227092289fa2f44fb96f.1551003074.git.gitgitgadget@gmail.com/
> > sent previously by Tanushree.
> >
> >  builtin/bisect--helper.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
> > index 3055b2bb50..1718df7f09 100644
> > --- a/builtin/bisect--helper.c
> > +++ b/builtin/bisect--helper.c
> > @@ -282,11 +282,11 @@ static int mark_good(const char *refname, const struct object_id *oid,
> >       return 1;
> >  }
> >
> > -static const char *need_bad_and_good_revision_warning =
> > +static const char need_bad_and_good_revision_warning[] =
> >       N_("You need to give me at least one %s and %s revision.\n"
> >          "You can use \"git bisect %s\" and \"git bisect %s\" for that.");
> >
> > -static const char *need_bisect_start_warning =
> > +static const char need_bisect_start_warning[] =
> >       N_("You need to start by \"git bisect start\".\n"
> >          "You then need to give me at least one %s and %s revision.\n"
> >          "You can use \"git bisect %s\" and \"git bisect %s\" for that.");
diff mbox series

Patch

diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
index 3055b2bb50..1718df7f09 100644
--- a/builtin/bisect--helper.c
+++ b/builtin/bisect--helper.c
@@ -282,11 +282,11 @@  static int mark_good(const char *refname, const struct object_id *oid,
 	return 1;
 }
 
-static const char *need_bad_and_good_revision_warning =
+static const char need_bad_and_good_revision_warning[] =
 	N_("You need to give me at least one %s and %s revision.\n"
 	   "You can use \"git bisect %s\" and \"git bisect %s\" for that.");
 
-static const char *need_bisect_start_warning =
+static const char need_bisect_start_warning[] =
 	N_("You need to start by \"git bisect start\".\n"
 	   "You then need to give me at least one %s and %s revision.\n"
 	   "You can use \"git bisect %s\" and \"git bisect %s\" for that.");