diff options
Diffstat (limited to 'lib/libxkbfile/src/xkmout.c')
-rw-r--r-- | lib/libxkbfile/src/xkmout.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/lib/libxkbfile/src/xkmout.c b/lib/libxkbfile/src/xkmout.c index 79d86efe1..1e4315703 100644 --- a/lib/libxkbfile/src/xkmout.c +++ b/lib/libxkbfile/src/xkmout.c @@ -6,19 +6,19 @@ fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting - documentation, and that the name of Silicon Graphics not be - used in advertising or publicity pertaining to distribution + documentation, and that the name of Silicon Graphics not be + used in advertising or publicity pertaining to distribution of the software without specific prior written permission. - Silicon Graphics makes no representation about the suitability + Silicon Graphics makes no representation about the suitability of this software for any purpose. It is provided "as is" without any express or implied warranty. - - SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS - SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + + SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS + SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON - GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL - DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE + GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL + DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. @@ -241,7 +241,7 @@ unsigned tmp,size= 0; dpy= xkb->dpy; kcName= xkb->names->keycodes; start= xkb->names->keys[xkb->min_key_code].name; - + size+= xkmPutCountedString(file,XkbAtomGetString(dpy,kcName)); size+= xkmPutCARD8(file,xkb->min_key_code); size+= xkmPutCARD8(file,xkb->max_key_code); @@ -660,7 +660,7 @@ register unsigned i,nLEDs; if ((map->flags!=0)||(map->which_groups!=0)||(map->groups!=0)|| (map->which_mods!=0)|| (map->mods.real_mods!=0)||(map->mods.vmods!=0)|| - (map->ctrls!=0) || + (map->ctrls!=0) || (xkb->names && (xkb->names->indicators[i]!=None))) { char *name; if (xkb->names && xkb->names->indicators[i]!=None) { @@ -938,7 +938,7 @@ unsigned tmp,size= 0; size+= tmp*SIZEOF(xkmOverlayKeyDesc); } } - return size; + return size; } static unsigned @@ -1259,7 +1259,7 @@ WriteXKMFile( FILE * file, { register int i; unsigned tmp,size,total= 0; - + for (i=0;i<num_toc;i++) { tmp= fwrite(&toc[i],SIZEOF(xkmSectionInfo),1,file); total+= tmp*SIZEOF(xkmSectionInfo); |