summaryrefslogtreecommitdiff
path: root/src/xkmread.c
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2011-09-16 22:45:06 -0700
committerAlan Coopersmith <alan.coopersmith@oracle.com>2011-09-16 22:45:06 -0700
commit9ffdecdfa0a832a129a97735eaf1d22ec6defc13 (patch)
tree1667369018fdf4074981eed2df6fe7baeb7b791d /src/xkmread.c
parentcfc92c9b8e5f511010a2e406b147dec3ce64c6fd (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/xkmread.c')
-rw-r--r--src/xkmread.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/xkmread.c b/src/xkmread.c
index ae05661..5df95aa 100644
--- a/src/xkmread.c
+++ b/src/xkmread.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.
@@ -302,7 +302,7 @@ XkbDescPtr xkb;
if ((tmp= XkmGetCountedString(file,buf,100))<1) {
_XkbLibError(_XkbErrBadLength,"ReadXkmKeyTypes",0);
return -1;
- }
+ }
nRead+= tmp;
if (buf[0]!='\0') {
if (XkbAllocNames(xkb,XkbTypesNameMask,0,0)!=Success) {
@@ -624,7 +624,7 @@ XkbDescPtr xkb;
Atom name;
name= XkbInternAtom(xkb->dpy,buf,0);
xkb->names->groups[i]= name;
- }
+ }
else xkb->names->groups[i]= None;
}
}
@@ -689,7 +689,7 @@ XkbDescPtr xkb;
if (XkbNumGroups(wireMap.num_groups)>0) {
KeySym *sym;
int nSyms;
-
+
if (XkbNumGroups(wireMap.num_groups)>xkb->ctrls->num_groups)
xkb->ctrls->num_groups= wireMap.num_groups;
nSyms= XkbNumGroups(wireMap.num_groups)*wireMap.width;