On 2016-03-16 11:53, Paul Bolle wrote:
> Add a helper function that strips trailing new lines and carriage
> returns from strings. Call it chomp, after the perl function that
> inspired it.
> 
> Signed-off-by: Paul Bolle <[email protected]>
> ---
>  scripts/kconfig/confdata.c | 22 ++++++++++++++++++++++
>  1 file changed, 22 insertions(+)
> 
> diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
> index 0b7dc2fd7bac..51904c423411 100644
> --- a/scripts/kconfig/confdata.c
> +++ b/scripts/kconfig/confdata.c
> @@ -248,6 +248,28 @@ e_out:
>       return -1;
>  }
>  
> +/*
> + * Return newly allocated copy of string "in" with all trailing new lines and
> + * carriage returns removed.
> + */
> +static char *chomp(char *in)
> +{
> +     size_t last = strlen(in);
> +     char *copy;
> +
> +     copy = malloc(last + 1);
> +     if (!copy)
> +             return NULL;
> +
> +     strcpy(copy, in);
> +     if (last)
> +             last--;
> +     while (last  && (copy[last] == '\r' || copy[last] == '\n'))
> +             copy[last--] = '\0';
> +
> +     return copy;
> +}
> +

For this particular use, it's probably easier to just write

conf_warning("unexpected data: %.*s",
             (int)strcspn(line, "\r\n"), line);

Or do you see more use cases for the chomp function?

No matter how the string is constructed, I like the verbose warning :)

Thanks,
Michal

Reply via email to