diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-29 19:52:34 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-29 19:52:34 -0200 |
| commit | d17cd6e80f1ec78b69ba11ee55465420e6d7e9a9 (patch) | |
| tree | 828a229ae9d48fb22ed17f7a127c99864c369e3e /src | |
| parent | dd9514fe714d81b881a1bd6bd88d4287adc5fc7e (diff) | |
Janitor: distcheck, compiler warnings, .gitignore.
Diffstat (limited to 'src')
| -rw-r--r-- | src/.gitignore | 6 | ||||
| -rw-r--r-- | src/xkbatom.c | 4 | ||||
| -rw-r--r-- | src/xkbconfig.c | 2 | ||||
| -rw-r--r-- | src/xkberrs.c | 7 | ||||
| -rw-r--r-- | src/xkmread.c | 4 |
5 files changed, 12 insertions, 11 deletions
diff --git a/src/.gitignore b/src/.gitignore deleted file mode 100644 index fc50197..0000000 --- a/src/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -.deps -.libs -libxkbfile.la -*.lo -Makefile -Makefile.in diff --git a/src/xkbatom.c b/src/xkbatom.c index 24bdcd7..4fca90c 100644 --- a/src/xkbatom.c +++ b/src/xkbatom.c @@ -178,8 +178,8 @@ static char * _XkbNameForAtom(Atom atom) { NodePtr node; - if (atom > lastAtom) return 0; - if ((node = nodeTable[atom]) == (NodePtr)NULL) return 0; + if (atom > lastAtom) return NULL; + if ((node = nodeTable[atom]) == (NodePtr)NULL) return NULL; return strdup(node->string); } diff --git a/src/xkbconfig.c b/src/xkbconfig.c index 7930979..37272ce 100644 --- a/src/xkbconfig.c +++ b/src/xkbconfig.c @@ -340,7 +340,7 @@ XkbCFAddModByName( XkbConfigRtrnPtr rtrn, XkbConfigUnboundModRec); if (rtrn->unbound_mods==NULL) { rtrn->error= XkbCF_BadAlloc; - return False; + return NULL; } } if (last==NULL) { diff --git a/src/xkberrs.c b/src/xkberrs.c index 1b856bc..a3ad52d 100644 --- a/src/xkberrs.c +++ b/src/xkberrs.c @@ -36,6 +36,13 @@ #include <ctype.h> #include <stdlib.h> +#include <X11/Xproto.h> +#include <X11/Xlib.h> +#include <X11/Xos.h> +#include <X11/Xfuncs.h> +#include <X11/XKBlib.h> +#include <X11/extensions/XKBfile.h> + char * _XkbErrMessages[] = { "success", /* _XkbSuccess */ "key names not defined", /* _XkbErrMissingNames */ diff --git a/src/xkmread.c b/src/xkmread.c index f22941f..91bfa7b 100644 --- a/src/xkmread.c +++ b/src/xkmread.c @@ -1208,7 +1208,7 @@ xkmSectionInfo tmpTOC; char name[100]; if ((!file)||(!toc)) - return 0; + return NULL; switch (toc->type) { case XkmVirtualModsIndex: case XkmIndicatorsIndex: @@ -1223,7 +1223,7 @@ char name[100]; if ((tmpTOC.type!=toc->type)||(tmpTOC.format!=toc->format)|| (tmpTOC.size!=toc->size)||(tmpTOC.offset!=toc->offset)) { _XkbLibError(_XkbErrIllegalContents,"XkmReadFileSectionName",0); - return 0; + return NULL; } if (XkmGetCountedString(file,name,100)>0) return _XkbDupString(name); |