summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2009-01-22 15:06:47 -0200
committerPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2009-01-22 15:06:47 -0200
commit0c3b1ab2daa3a48d33da55f016d6771b8faaef7b (patch)
tree946ab73e7e32407896b6f1a21680ae620a96133b
parent98b7afc0d1d53a766ea60175e9fc5f031051f057 (diff)
downloadxkbutils-0c3b1ab2daa3a48d33da55f016d6771b8faaef7b.tar.gz
xkbutils-0c3b1ab2daa3a48d33da55f016d6771b8faaef7b.tar.bz2
xkbutils-0c3b1ab2daa3a48d33da55f016d6771b8faaef7b.zip
Correct make distcheck and sparse warnings.
-rw-r--r--.gitignore9
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac10
-rw-r--r--utils.c2
-rw-r--r--utils.h6
-rw-r--r--xkbbell.c2
-rw-r--r--xkbvleds.c18
-rw-r--r--xkbwatch.c5
8 files changed, 36 insertions, 18 deletions
diff --git a/.gitignore b/.gitignore
index e4723b5..7079f65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,16 +4,25 @@ Makefile.in
aclocal.m4
autom4te.cache
compile
+config.guess
config.h
config.h.in
config.log
config.status
+config.sub
configure
depcomp
install-sh
missing
stamp-h1
xkbbell
+xkbbell.1
xkbvleds
+xkbvleds.1
xkbwatch
+xkbwatch.1
*~
+*.o
+xkbutils-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index 9d1a3cf..623cc8b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -77,6 +77,6 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man
.PHONY: ChangeLog
ChangeLog:
- (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+ $(CHANGELOG_CMD)
dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index 269049f..a6f68fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,28 +26,38 @@ AC_INIT(xkbutils,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xo
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
+# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2)
+
AM_CONFIG_HEADER(config.h)
AC_PROG_CC
AM_PROG_CC_C_O
AC_PROG_INSTALL
+XORG_CWARNFLAGS
+
# xkbvleds checks
PKG_CHECK_MODULES(XKBVLEDS, xaw7)
+XKBVLEDS_CFLAGS="$CWARNFLAGS $XKBVLEDS_CFLAGS"
AC_SUBST(XKBVLEDS_CFLAGS)
AC_SUBST(XKBVLEDS_LIBS)
# xkbbell checks
PKG_CHECK_MODULES(XKBBELL, xkbfile x11 inputproto)
+XKBBELL_CFLAGS="$CWARNFLAGS $XKBBELL_CFLAGS"
AC_SUBST(XKBBELL_CFLAGS)
AC_SUBST(XKBBELL_LIBS)
# xkbwatch checks
PKG_CHECK_MODULES(XKBWATCH, xaw7)
+XKBWATCH_CFLAGS="$CWARNFLAGS $XKBWATCH_CFLAGS"
AC_SUBST(XKBWATCH_CFLAGS)
AC_SUBST(XKBWATCH_LIBS)
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([Makefile])
diff --git a/utils.c b/utils.c
index 1c2d552..37eebee 100644
--- a/utils.c
+++ b/utils.c
@@ -31,6 +31,8 @@
#include <ctype.h>
#include <stdlib.h>
+unsigned int debugFlags;
+
/***====================================================================***/
Opaque
diff --git a/utils.h b/utils.h
index d353be0..2126f8a 100644
--- a/utils.h
+++ b/utils.h
@@ -173,9 +173,7 @@ extern char *uStringDup(
#define DEBUG_VAR debugFlags
#endif
-#ifdef DEBUG_VAR_NOT_LOCAL
extern
-#endif
unsigned int DEBUG_VAR;
extern void uDebug( char *s, ... );
@@ -223,14 +221,14 @@ extern void uEntry(int l, char *s, ... );
extern void uExit(
int l,char *rtVal
);
+
+extern int uEntryLevel;
#ifdef ENTRY_TRACKING_ON
#define ENTRY_BIT 0x10
#define LOW_ENTRY_BIT 0x1000
#define ENTER (DEBUG_VAR&ENTRY_BIT)
#define FLAG(fLag) (DEBUG_VAR&(fLag))
-extern int uEntryLevel;
-
#define uENTRY(s) { if (ENTER) uEntry(1,s);}
#define uENTRY1(s,a) { if (ENTER) uEntry(1,s,a);}
#define uENTRY2(s,a,b) { if (ENTER) uEntry(1,s,a,b);}
diff --git a/xkbbell.c b/xkbbell.c
index 3976f72..cc30c8a 100644
--- a/xkbbell.c
+++ b/xkbbell.c
@@ -195,7 +195,7 @@ int i1,i2,i3,i4,i5;
}
if (force && (nameAtom!=None))
fprintf(stderr,"Warning! Name ignored for forced bell requests\n");
- if (bellName!='\0')
+ if (bellName!=NULL)
nameAtom = XInternAtom(dpy,bellName,0);
if ((devSpec==XkbUseCoreKbd)&&(class<0)) {
Bool ok;
diff --git a/xkbvleds.c b/xkbvleds.c
index 6d733d3..2bb1650 100644
--- a/xkbvleds.c
+++ b/xkbvleds.c
@@ -49,17 +49,17 @@
#define NO 0
#define DONT_CARE -1
- Display * inDpy,*outDpy;
+static Display * inDpy,*outDpy;
static unsigned long wanted,real,named,explicit,automatic,virtual;
static char * inDpyName;
- int wantNamed= DONT_CARE;
- int wantExplicit= DONT_CARE;
- int wantAutomatic= DONT_CARE;
- int wantReal= DONT_CARE;
- int wantVirtual= DONT_CARE;
- int evBase,errBase;
- Bool synch;
- Bool useUnion= True;
+static int wantNamed= DONT_CARE;
+static int wantExplicit= DONT_CARE;
+static int wantAutomatic= DONT_CARE;
+static int wantReal= DONT_CARE;
+static int wantVirtual= DONT_CARE;
+static int evBase,errBase;
+static Bool synch;
+static Bool useUnion= True;
/***====================================================================***/
diff --git a/xkbwatch.c b/xkbwatch.c
index c0e6aed..6211ae8 100644
--- a/xkbwatch.c
+++ b/xkbwatch.c
@@ -45,9 +45,8 @@
/***====================================================================***/
- Display * inDpy,*outDpy;
- int evBase,errBase;
- Bool synch;
+static Display * inDpy,*outDpy;
+static int evBase,errBase;
/***====================================================================***/