This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: [PATCH] Remove unused defines from strxfrm_l.c and strcoll_l.c
- From: "Carlos O'Donell" <carlos at redhat dot com>
- To: Leonhard Holz <leonhard dot holz at web dot de>, libc-alpha at sourceware dot org, OndÅej BÃlka <neleai at seznam dot cz>
- Date: Mon, 09 Feb 2015 15:32:32 -0500
- Subject: Re: [PATCH] Remove unused defines from strxfrm_l.c and strcoll_l.c
- Authentication-results: sourceware.org; auth=none
- References: <54D7E17A dot 3060405 at web dot de>
On 02/08/2015 05:21 PM, Leonhard Holz wrote:
> Sorry, I overlooked the widechar versions. Let's include them.
Please prefix patches with subject "v2" if you update a previous
patch, that makes it easier for me to review the patchwork queue.
> * string/strxfrm_l.c: Remove #define STRCMP.
> * string/strcoll_l.c: Remove #define STRLEN.
> * wcsmbs/wcsxfrm_l.c: Remove #define STRCMP.
> * wcsmbs/wcscoll_l.c: Remove #define STRLEN.
Looks good to me.
Ondrej, Same question, could you help check these in for Leonhard?
> diff --git a/string/strxfrm_l.c b/string/strxfrm_l.c
> index 921d1f7..8b61ea2 100644
> --- a/string/strxfrm_l.c
> +++ b/string/strxfrm_l.c
> @@ -29,7 +29,6 @@
> # define STRING_TYPE char
> # define USTRING_TYPE unsigned char
> # define STRXFRM __strxfrm_l
> -# define STRCMP strcmp
> # define STRLEN strlen
> # define STPNCPY __stpncpy
> # define WEIGHT_H "../locale/weight.h"
>
> diff --git a/string/strcoll_l.c b/string/strcoll_l.c
> index 85422bd..658d5b9 100644
> --- a/string/strcoll_l.c
> +++ b/string/strcoll_l.c
> @@ -30,7 +30,6 @@
> # define USTRING_TYPE unsigned char
> # define STRCOLL __strcoll_l
> # define STRCMP strcmp
> -# define STRLEN strlen
> # define WEIGHT_H "../locale/weight.h"
> # define SUFFIX MB
> # define L(arg) arg
>
> diff --git a/wcsmbs/wcsxfrm_l.c b/wcsmbs/wcsxfrm_l.c
> index 7d9083b..53ac951 100644
> --- a/wcsmbs/wcsxfrm_l.c
> +++ b/wcsmbs/wcsxfrm_l.c
> @@ -22,7 +22,6 @@
> #define STRING_TYPE wchar_t
> #define USTRING_TYPE wint_t
> #define STRXFRM __wcsxfrm_l
> -#define STRCMP wcscmp
> #define STRLEN __wcslen
> #define STPNCPY __wcpncpy
> #define WEIGHT_H "../locale/weightwc.h"
>
> diff --git a/wcsmbs/wcscoll_l.c b/wcsmbs/wcscoll_l.c
> index 86ae4d9..106ec93 100644
> --- a/wcsmbs/wcscoll_l.c
> +++ b/wcsmbs/wcscoll_l.c
> @@ -24,7 +24,6 @@
> #define USTRING_TYPE wint_t
> #define STRCOLL __wcscoll_l
> #define STRCMP wcscmp
> -#define STRLEN __wcslen
> #define WEIGHT_H "../locale/weightwc.h"
> #define SUFFIX WC
> #define L(arg) L##arg
Cheers,
Carlos.