diff options
author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-09-16 22:45:06 -0700 |
---|---|---|
committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-09-16 22:45:06 -0700 |
commit | 9ffdecdfa0a832a129a97735eaf1d22ec6defc13 (patch) | |
tree | 1667369018fdf4074981eed2df6fe7baeb7b791d /src/xkbout.c | |
parent | cfc92c9b8e5f511010a2e406b147dec3ce64c6fd (diff) |
Strip trailing whitespace
Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}'
git diff -w & git diff -b show no diffs from this change
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Diffstat (limited to 'src/xkbout.c')
-rw-r--r-- | src/xkbout.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/xkbout.c b/src/xkbout.c index caf5999..ad1fd03 100644 --- a/src/xkbout.c +++ b/src/xkbout.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. @@ -221,7 +221,7 @@ XkbDescPtr xkb; XkbXKBFile)); entry= type->map; for (n=0;n<type->map_count;n++,entry++) { - char *str; + char *str; str=XkbVModMaskText(dpy,xkb,entry->mods.real_mods,entry->mods.vmods, XkbXKBFile); fprintf(file," map[%s]= Level%d;\n",str,entry->level+1); @@ -328,7 +328,7 @@ XkbDescPtr xkb; fprintf(file," interpret.locking= False;\n"); interp= xkb->compat->sym_interpret; for (i=0;i<xkb->compat->num_si;i++,interp++) { - fprintf(file," interpret %s+%s(%s) {\n", + fprintf(file," interpret %s+%s(%s) {\n", ((interp->sym==NoSymbol)?"Any": XkbKeysymText(interp->sym,XkbXKBFile)), XkbSIMatchText(interp->match,XkbXKBFile), @@ -512,7 +512,7 @@ Bool showActions; ((srv->explicit[i]&XkbExplicitInterpretMask)!=0)) showActions= XkbKeyHasActions(xkb,i); else showActions= False; - + if (((unsigned)XkbKeyNumGroups(xkb,i)>1)||showActions) simple= False; if (simple) { |