diff options
| author | marha <marha@users.sourceforge.net> | 2009-10-07 08:43:18 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-10-07 08:43:18 +0000 |
| commit | c73dc01b6de45612b24dc2dd34fba24d81ebf46c (patch) | |
| tree | 50278a03a26262d5cc30244c65aeb31002c47cec /libxkbfile/src/xkmread.c | |
| parent | 77a4732b0637493966889fe3545966fdc12a1b5e (diff) | |
| download | vcxsrv-c73dc01b6de45612b24dc2dd34fba24d81ebf46c.tar.gz vcxsrv-c73dc01b6de45612b24dc2dd34fba24d81ebf46c.tar.bz2 vcxsrv-c73dc01b6de45612b24dc2dd34fba24d81ebf46c.zip | |
Switched to following packages:
fixesproto-4.1.1
randrproto-1.3.1
libxkbfile-1.0.6
Diffstat (limited to 'libxkbfile/src/xkmread.c')
| -rw-r--r-- | libxkbfile/src/xkmread.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/libxkbfile/src/xkmread.c b/libxkbfile/src/xkmread.c index f22941f67..bf46becc1 100644 --- a/libxkbfile/src/xkmread.c +++ b/libxkbfile/src/xkmread.c @@ -76,19 +76,6 @@ XkbInternAtom(Display *dpy,char *str,Bool only_if_exists) #define SEEK_SET 0 #endif -char * -_XkbDupString(char *str) -{ -char *new; - - if (str==NULL) - return NULL; - new= (char *)_XkbCalloc(strlen(str)+1,sizeof(char)); - if (new) - strcpy(new,str); - return new; -} - /***====================================================================***/ static XPointer @@ -1208,7 +1195,7 @@ xkmSectionInfo tmpTOC; char name[100]; if ((!file)||(!toc)) - return 0; + return NULL; switch (toc->type) { case XkmVirtualModsIndex: case XkmIndicatorsIndex: @@ -1223,7 +1210,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); |