From 057ddde08e30bf79440a8c983090a1cf1bd4de9d Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sun, 16 Oct 2016 00:19:47 +0200 Subject: xkmread.c: use _X_UNUSED to avoid compiler warning when result is not needed --- nx-X11/programs/Xserver/xkb/xkmread.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'nx-X11/programs/Xserver/xkb') diff --git a/nx-X11/programs/Xserver/xkb/xkmread.c b/nx-X11/programs/Xserver/xkb/xkmread.c index 18ab21dca..1d8f6d772 100644 --- a/nx-X11/programs/Xserver/xkb/xkmread.c +++ b/nx-X11/programs/Xserver/xkb/xkmread.c @@ -1085,7 +1085,8 @@ unsigned i,size_toc; } return 0; } - fread(file_info,SIZEOF(xkmFileInfo),1,file); + _X_UNUSED int ignored_result; + ignored_result = fread(file_info,SIZEOF(xkmFileInfo),1,file); size_toc= file_info->num_toc; if (size_toc>max_toc) { #ifdef DEBUG @@ -1095,7 +1096,7 @@ unsigned i,size_toc; size_toc= max_toc; } for (i=0;ioffset,SEEK_SET); - fread(&tmpTOC,SIZEOF(xkmSectionInfo),1,file); + _X_UNUSED int ignored_result; + ignored_result = fread(&tmpTOC,SIZEOF(xkmSectionInfo),1,file); nRead= SIZEOF(xkmSectionInfo); if ((tmpTOC.type!=toc->type)||(tmpTOC.format!=toc->format)|| (tmpTOC.size!=toc->size)||(tmpTOC.offset!=toc->offset)) { @@ -1201,7 +1203,8 @@ char name[100]; case XkmSymbolsIndex: case XkmGeometryIndex: fseek(file,toc->offset,SEEK_SET); - fread(&tmpTOC,SIZEOF(xkmSectionInfo),1,file); + _X_UNUSED int ignored_result; + ignored_result = fread(&tmpTOC,SIZEOF(xkmSectionInfo),1,file); if ((tmpTOC.type!=toc->type)||(tmpTOC.format!=toc->format)|| (tmpTOC.size!=toc->size)||(tmpTOC.offset!=toc->offset)) { _XkbLibError(_XkbErrIllegalContents,"XkmReadFileSectionName",0); -- cgit v1.2.3 From 0a28292ec986070edccc8fc1eea4c3d3e280e102 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sun, 16 Oct 2016 00:41:11 +0200 Subject: xkb.c: fix 'assignment makes integer from pointer without a cast' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit xkb.c: In function ‘_GetCountedString’: xkb.c:4405:8: warning: assignment makes integer from pointer without a cast [enabled by default] len= (CARD16 *)wire; --- nx-X11/programs/Xserver/xkb/xkb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nx-X11/programs/Xserver/xkb') diff --git a/nx-X11/programs/Xserver/xkb/xkb.c b/nx-X11/programs/Xserver/xkb/xkb.c index 3e4cf4acd..a78541e75 100644 --- a/nx-X11/programs/Xserver/xkb/xkb.c +++ b/nx-X11/programs/Xserver/xkb/xkb.c @@ -4402,7 +4402,7 @@ char * wire, *next; CARD16 len; wire= *wire_inout; - len= (CARD16 *)wire; + len = *(CARD16 *) wire; if (client->swapped) { swaps(&len); } -- cgit v1.2.3