Re: [PATCH xserver] xfree86: Restore newline before "X Protocol Version" string

[Peter Hutterer]

On Mon, Apr 02, 2018 at 03:04:08PM -0700, Aaron Plattner wrote:
> The newline before the protocl version got lost in commit
> 6cbefc3e0a33b380c147c533914437c7798d9b93. Prior to that commit, the
> release date printed a newline at the end:
> 
>  X.Org X Server 1.19.6
>  Release Date: 2017-12-20
>  X Protocol Version 11, Revision 0
>  Build Operating System: Linux 4.14.12-1-ARCH x86_64
> 
> Now, that string gets run together with the version:
> 
>  X.Org X Server 1.19.99.903 (1.20.0 RC 3)X Protocol Version 11, Revision 0
>  Build Operating System: Linux
> 
> Since the version string printing has a variety of #ifdefs in it, just
> add the newline to the begining of the protocol version string.
> 
> Signed-off-by: Aaron Plattner 

remote: Updating patchwork state for 
https://patchwork.freedesktop.org/project/Xorg/list/
remote: I: patch #214323 updated using rev 
574069c2912893a9b9fd3d701eb3ad4784e31553.
remote: I: 1 patch(es) updated to state Accepted.
To git+ssh://git.freedesktop.org/git/xorg/xserver
   df6cbf7a2..574069c29  master -> master

Cheers,
   Peter

> ---
>  hw/xfree86/common/xf86Init.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
> index ea42ec946167..3c5cc7097c49 100644
> --- a/hw/xfree86/common/xf86Init.c
> +++ b/hw/xfree86/common/xf86Init.c
> @@ -165,7 +165,7 @@ xf86PrintBanner(void)
>  #ifdef XORG_CUSTOM_VERSION
>  xf86ErrorFVerb(0, " (%s)", XORG_CUSTOM_VERSION);
>  #endif
> -xf86ErrorFVerb(0, "X Protocol Version %d, Revision %d\n",
> +xf86ErrorFVerb(0, "\nX Protocol Version %d, Revision %d\n",
> X_PROTOCOL, X_PROTOCOL_REVISION);
>  xf86ErrorFVerb(0, "Build Operating System: %s %s\n", OSNAME, OSVENDOR);
>  #ifdef HAS_UTSNAME
> -- 
> 2.16.3
> 
> ___
> xorg-devel@lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: https://lists.x.org/mailman/listinfo/xorg-devel
> 
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

[PATCH xserver] xfree86: Restore newline before "X Protocol Version" string

[Aaron Plattner]

The newline before the protocl version got lost in commit
6cbefc3e0a33b380c147c533914437c7798d9b93. Prior to that commit, the
release date printed a newline at the end:

 X.Org X Server 1.19.6
 Release Date: 2017-12-20
 X Protocol Version 11, Revision 0
 Build Operating System: Linux 4.14.12-1-ARCH x86_64

Now, that string gets run together with the version:

 X.Org X Server 1.19.99.903 (1.20.0 RC 3)X Protocol Version 11, Revision 0
 Build Operating System: Linux

Since the version string printing has a variety of #ifdefs in it, just
add the newline to the begining of the protocol version string.

Signed-off-by: Aaron Plattner 
---
 hw/xfree86/common/xf86Init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index ea42ec946167..3c5cc7097c49 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -165,7 +165,7 @@ xf86PrintBanner(void)
 #ifdef XORG_CUSTOM_VERSION
 xf86ErrorFVerb(0, " (%s)", XORG_CUSTOM_VERSION);
 #endif
-xf86ErrorFVerb(0, "X Protocol Version %d, Revision %d\n",
+xf86ErrorFVerb(0, "\nX Protocol Version %d, Revision %d\n",
X_PROTOCOL, X_PROTOCOL_REVISION);
 xf86ErrorFVerb(0, "Build Operating System: %s %s\n", OSNAME, OSVENDOR);
 #ifdef HAS_UTSNAME
-- 
2.16.3

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel