xorg/driver/xf86-input-keyboard: [PATCH 2/2] Janitor: compiler warnings, .gitignore.

Peter Hutterer peter.hutterer at who-t.net
Wed Feb 4 14:54:58 PST 2009


On Wed, Feb 04, 2009 at 07:39:52PM -0200, Paulo César Pereira de Andrade wrote:
>   This is a "pure" janitor patch, and should be
> trivial enough.
> 
>   But to not leave an empty email :-) I commented
> about the warnings generated due to no previous
> prototype for the symbols that dlloader uses when
> loading a module. Maybe they should be declared
> in a module/driver private header?
> 
> 
>   Some time ago I posted a "rfb" (request for brainstorm :-)
> about possibly using a concept like LinkKit for Xorg.
> In that case, modules would be linked in a single binary,
> and the current/ancient xorg.conf would actually be a
> Makefile. In that case, a, probably generated C source
> code would possibly need a declaration for the symbol.
 
I'd much prefer it if you did not have unrelated issues in a patch email.

> From 3d5c6b3e34ee4bf2f0be3bb189acdc66abf7f70c Mon Sep 17 00:00:00 2001
> From: Paulo Cesar Pereira de Andrade <pcpa at mandriva.com.br>
> Date: Wed, 4 Feb 2009 18:59:23 -0200
> Subject: [PATCH 2/2] Janitor: compiler warnings, .gitignore.
> 
>   Correct common sparse warning about integer used where a pointer
> is expected. Remaining warnings are about the symbols that the
> X Server loader should "dlsym()" to load the module, and are
> extern/exported, but have no declaration anywhere.
> 
>   Use only one .gitignore file in the toplevel directory.
> 
> Signed-off-by: Paulo Cesar Pereira de Andrade <pcpa at mandriva.com.br>
> ---
>  .gitignore     |    4 ++++
>  man/.gitignore |    2 --
>  src/.gitignore |    6 ------
>  src/kbd.c      |    2 +-
>  4 files changed, 5 insertions(+), 9 deletions(-)
>  delete mode 100644 man/.gitignore
>  delete mode 100644 src/.gitignore
> 
> diff --git a/.gitignore b/.gitignore
> index 8cc2c1c..eb19a4e 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -1,3 +1,4 @@
> +.deps
>  Makefile
>  Makefile.in
>  *.la
> @@ -19,3 +20,6 @@ missing
>  stamp-h1
>  *~
>  kbd.4
> +xf86-input-keyboard-*.tar.*
> +ChangeLog
> +tags
> diff --git a/man/.gitignore b/man/.gitignore
> deleted file mode 100644
> index 282522d..0000000
> --- a/man/.gitignore
> +++ /dev/null
> @@ -1,2 +0,0 @@
> -Makefile
> -Makefile.in
> diff --git a/src/.gitignore b/src/.gitignore
> deleted file mode 100644
> index 9730646..0000000
> --- a/src/.gitignore
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -.deps
> -.libs
> -Makefile
> -Makefile.in
> -*.la
> -*.lo
> diff --git a/src/kbd.c b/src/kbd.c
> index dd3e099..001cde9 100644
> --- a/src/kbd.c
> +++ b/src/kbd.c
> @@ -280,7 +280,7 @@ KbdPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
>      pInfo->fd = -1;
>      pInfo->dev = NULL;
>      pInfo->private_flags = 0;
> -    pInfo->always_core_feedback = 0;
> +    pInfo->always_core_feedback = NULL;
>      pInfo->conf_idev = dev;
>  
>      if (!xf86IsPc98())
> -- 
> 1.6.1

Pushed, thanks.

Cheers,
  Peter



More information about the xorg mailing list