aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/lib/X11/IntAtom.c
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-10-12 08:32:04 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-10-12 08:32:04 +0200
commit051d521f6e20761ba6831cecd91883da960fa931 (patch)
treeb28abba7818115d2fed80eb360a79a0f9183948e /nx-X11/lib/X11/IntAtom.c
parent6dce607bad8711dd06a5a7b69ad1930386b4123b (diff)
parentb8de7bf654929c823080b211aeac56cd213f5a32 (diff)
downloadnx-libs-051d521f6e20761ba6831cecd91883da960fa931.tar.gz
nx-libs-051d521f6e20761ba6831cecd91883da960fa931.tar.bz2
nx-libs-051d521f6e20761ba6831cecd91883da960fa931.zip
Merge branch 'uli42-pr/upgrade_libX11' into 3.6.x
Attributes GH PR #214: https://github.com/ArcticaProject/nx-libs/pull/214 Fixes ArcticaProject/nx-libs#157.
Diffstat (limited to 'nx-X11/lib/X11/IntAtom.c')
-rw-r--r--nx-X11/lib/X11/IntAtom.c31
1 files changed, 15 insertions, 16 deletions
diff --git a/nx-X11/lib/X11/IntAtom.c b/nx-X11/lib/X11/IntAtom.c
index a1f9f7f14..7a5625840 100644
--- a/nx-X11/lib/X11/IntAtom.c
+++ b/nx-X11/lib/X11/IntAtom.c
@@ -37,8 +37,7 @@ from The Open Group.
#define REHASH(idx,rehash) ((idx + rehash) & (TABLESIZE-1))
void
-_XFreeAtomTable(dpy)
- Display *dpy;
+_XFreeAtomTable(Display *dpy)
{
register Entry *table;
register int i;
@@ -113,13 +112,13 @@ nomatch: if (idx == firstidx)
}
void
-_XUpdateAtomCache(dpy, name, atom, sig, idx, n)
- Display *dpy;
- const char *name;
- Atom atom;
- unsigned long sig;
- int idx;
- int n;
+_XUpdateAtomCache(
+ Display *dpy,
+ const char *name,
+ Atom atom,
+ unsigned long sig,
+ int idx,
+ int n)
{
Entry e, oe;
register char *s1;
@@ -238,12 +237,12 @@ Bool _XIntAtomHandler(
}
Status
-XInternAtoms (dpy, names, count, onlyIfExists, atoms_return)
- Display *dpy;
- char **names;
- int count;
- Bool onlyIfExists;
- Atom *atoms_return;
+XInternAtoms (
+ Display *dpy,
+ char **names,
+ int count,
+ Bool onlyIfExists,
+ Atom *atoms_return)
{
int i, idx, n, tidx;
unsigned long sig;
@@ -283,7 +282,7 @@ XInternAtoms (dpy, names, count, onlyIfExists, atoms_return)
}
if (_XReply (dpy, (xReply *)&rep, 0, xTrue)) {
if ((atoms_return[missed] = rep.atom))
- _XUpdateAtomCache(dpy, names[missed], (Atom) rep.atom,
+ _XUpdateAtomCache(dpy, names[missed], (Atom) rep.atom,
sig, idx, n);
} else {
atoms_return[missed] = None;