[PATCH] wineboot: Changed sz and sz2 declaration and assignment

Michael Stefaniuc mstefani at winehq.org
Fri Feb 2 15:50:09 CST 2018


Hello Isira,

On 02/02/2018 10:10 AM, Isira Seneviratne wrote:
> 0001-wineboot-Changed-sz-and-sz2-declaration-and-assignme.patch
> 
> 
> From aed89de9352688c91864833a0f27a2d3cc8f2320 Mon Sep 17 00:00:00 2001
> From: Isira Seneviratne <isirasen96 at gmail.com>
> Date: Fri, 2 Feb 2018 06:14:14 +0530
> Subject: [PATCH] wineboot: Changed sz and sz2 declaration and assignment
> 
> This is my first Wine commit.
welcome to Wine development.

You've got a few things right for the first patch:
- A real name
- A summary describing the change
- Patch not mangled by the email client
- The code builds without warnings

But there is one critical issue. The commit is introducing dangling
whitespace and thus it doesn't applies. Actually 'git commit' using
default settings should have blocked you from creating the commit in the
first place:

git am --ignore-whitespace /tmp/\[PATCH\]\ wineboot\:\ Changed\ sz\ and\
sz2\ declaration\ and\ assignment.eml
Applying: wineboot: Changed sz and sz2 declaration and assignment
.git/rebase-apply/patch:26: trailing whitespace.

warning: 1 line adds whitespace errors.
*
* You have some suspicious patch lines:
*
* In programs/wineboot/wineboot.c
* trailing whitespace (line 836)
programs/wineboot/wineboot.c:836:


Based on your comment "This is my first Wine commit" and the patch
content(*) I'm assuming this was just a test submit to verify your
settings. So you do not have to resubmit. To test you can send yourself
the email, save that and apply it on a new branch with "git am".

(*) The patch itself is a no-op in both ways:
- The compiler will generate the same/equivalent output.
- The source code is not improved but also not made worse.
It is a matter of style / taste which one is preferred. So in Wine we
avoid patches that are just a matter of taste.

bye
	michael



> 
> Signed-off-by: Isira Seneviratne <isirasen96 at gmail.com>
> ---
>  programs/wineboot/wineboot.c | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c
> index 2a65b9e8b3..529cfa3615 100644
> --- a/programs/wineboot/wineboot.c
> +++ b/programs/wineboot/wineboot.c
> @@ -823,8 +823,7 @@ static int ProcessWindowsFileProtection(void)
>          static const WCHAR dotdotW[] = {'.','.',0};
>          WCHAR targetpath[MAX_PATH];
>          WCHAR currentpath[MAX_PATH];
> -        UINT sz;
> -        UINT sz2;
> +        UINT sz, sz2;
>          WCHAR tempfile[MAX_PATH];
>  
>          if (strcmpW(finddata.cFileName,dotW) == 0 || strcmpW(finddata.cFileName,dotdotW) == 0)
> @@ -833,8 +832,8 @@ static int ProcessWindowsFileProtection(void)
>              continue;
>          }
>  
> -        sz = MAX_PATH;
> -        sz2 = MAX_PATH;
> +        sz = sz2 = MAX_PATH;
> +        
>          VerFindFileW(VFFF_ISSHAREDFILE, finddata.cFileName, windowsdir,
>                       windowsdir, currentpath, &sz, targetpath, &sz2);
>          sz = MAX_PATH;
> -- 2.16.1
> 
> 
> 




More information about the wine-devel mailing list