[PATCH 1/7] winemenubuilder: Change blacklist to a more neutral word

Jeff Smith whydoubt at gmail.com
Tue Jun 16 11:33:08 CDT 2020


The word "block" is an overloaded term, so "blocklist" is ambiguous and
awkward.  If we're going to replace a word, let's at least come up with
a _good_ alternative.  I would also point out that the word does not
necessarily have to contain "list".

Looking at the thesaurus gives a few reasonable ideas, though which is
'best' may vary from case to case.  I have grouped these in what I feel
is the most forceful (1) to least forceful (3) in tone.  To get the
same intent, it is probably best to stick with (1) or (2).
    1. ban, banlist
    2. exclude, reject, deny
    3. avoid, ignore

On Tue, Jun 16, 2020 at 8:35 AM André Hentschel <nerv at dawncrow.de> wrote:
>
> Signed-off-by: André Hentschel <nerv at dawncrow.de>
> ---
>  programs/winemenubuilder/winemenubuilder.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c
> index d6fc9e29234..8409035a8f0 100644
> --- a/programs/winemenubuilder/winemenubuilder.c
> +++ b/programs/winemenubuilder/winemenubuilder.c
> @@ -2470,7 +2470,7 @@ static BOOL write_freedesktop_mime_type_entry(const char *packages_dir, const ch
>      return ret;
>  }
>
> -static BOOL is_extension_blacklisted(LPCWSTR extension)
> +static BOOL is_extension_blocklisted(LPCWSTR extension)
>  {
>      /* These are managed through external tools like wine.desktop, to evade malware created file type associations */
>      static const WCHAR comW[] = {'.','c','o','m',0};
> @@ -2564,7 +2564,7 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package
>              size *= 2;
>          } while (ret == ERROR_MORE_DATA);
>
> -        if (ret == ERROR_SUCCESS && extensionW[0] == '.' && !is_extension_blacklisted(extensionW))
> +        if (ret == ERROR_SUCCESS && extensionW[0] == '.' && !is_extension_blocklisted(extensionW))
>          {
>              char *extensionA = NULL;
>              WCHAR *commandW = NULL;
> --
> 2.17.1
>
>



More information about the wine-devel mailing list