Skip to content

N
nx-libs
You need to sign in or sign up before continuing.
Commit 057ddde0 authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Ulrich Sibiller
Browse files
Options

xkmread.c: use _X_UNUSED to avoid compiler warning when result is not needed

parent 33b5911f
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 4 deletions
nx-X11/programs/Xserver/xkb/xkmread.c
View file @ 057ddde0
...@@ -1085,7 +1085,8 @@ unsigned i,size_toc; ...@@ -1085,7 +1085,8 @@ unsigned i,size_toc;
} }
return 0; 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; size_toc= file_info->num_toc;
if (size_toc>max_toc) { if (size_toc>max_toc) {
#ifdef DEBUG #ifdef DEBUG
...@@ -1095,7 +1096,7 @@ unsigned i,size_toc; ...@@ -1095,7 +1096,7 @@ unsigned i,size_toc;
size_toc= max_toc; size_toc= max_toc;
} }
for (i=0;i<size_toc;i++) { for (i=0;i<size_toc;i++) {
fread(&toc[i],SIZEOF(xkmSectionInfo),1,file); ignored_result = fread(&toc[i],SIZEOF(xkmSectionInfo),1,file);
} }
return 1; return 1;
} }
...@@ -1126,7 +1127,8 @@ int nRead; ...@@ -1126,7 +1127,8 @@ int nRead;
return 0; return 0;
} }
fseek(file,toc->offset,SEEK_SET); 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);
nRead= SIZEOF(xkmSectionInfo); nRead= SIZEOF(xkmSectionInfo);
if ((tmpTOC.type!=toc->type)||(tmpTOC.format!=toc->format)|| if ((tmpTOC.type!=toc->type)||(tmpTOC.format!=toc->format)||
(tmpTOC.size!=toc->size)||(tmpTOC.offset!=toc->offset)) { (tmpTOC.size!=toc->size)||(tmpTOC.offset!=toc->offset)) {
...@@ -1201,7 +1203,8 @@ char name[100]; ...@@ -1201,7 +1203,8 @@ char name[100];
case XkmSymbolsIndex: case XkmSymbolsIndex:
case XkmGeometryIndex: case XkmGeometryIndex:
fseek(file,toc->offset,SEEK_SET); 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)|| if ((tmpTOC.type!=toc->type)||(tmpTOC.format!=toc->format)||
(tmpTOC.size!=toc->size)||(tmpTOC.offset!=toc->offset)) { (tmpTOC.size!=toc->size)||(tmpTOC.offset!=toc->offset)) {
_XkbLibError(_XkbErrIllegalContents,"XkmReadFileSectionName",0); _XkbLibError(_XkbErrIllegalContents,"XkmReadFileSectionName",0);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment