diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2010-11-21 20:49:05 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2010-11-24 15:23:27 -0800 |
| commit | c8701115462b482d99ecff24d9de0f2806084ba5 (patch) | |
| tree | 98546b52a3c26dc6d40eb4d1cd11bb60e1510f08 | |
| parent | 24db5b5ff0d51b0ed9d9701a792c5f14f23b638d (diff) | |
Mark atom names argument to XInternAtoms as const
Updates code & docs for XInternAtoms.
The single atom name argument to XInternAtom was already const char *
in the code, but not the docs, so updated it in the docs too.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | include/X11/Xlib.h | 2 | ||||
| -rw-r--r-- | man/XInternAtom.man | 8 | ||||
| -rw-r--r-- | specs/libX11/CH04.xml | 4 | ||||
| -rw-r--r-- | src/IntAtom.c | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/include/X11/Xlib.h b/include/X11/Xlib.h index 5c6c7707..b0d7d4dc 100644 --- a/include/X11/Xlib.h +++ b/include/X11/Xlib.h @@ -1548,7 +1548,7 @@ extern Atom XInternAtom( ); extern Status XInternAtoms( Display* /* dpy */, - char** /* names */, + _Xconst char** /* names */, int /* count */, Bool /* onlyIfExists */, Atom* /* atoms_return */ diff --git a/man/XInternAtom.man b/man/XInternAtom.man index 237ed91c..44aa68a6 100644 --- a/man/XInternAtom.man +++ b/man/XInternAtom.man @@ -144,11 +144,11 @@ XInternAtom, XInternAtoms, XGetAtomName, XGetAtomNames \- create or return atom names .SH SYNTAX .HP -Atom XInternAtom\^(\^Display *\fIdisplay\fP\^, char *\fIatom_name\fP\^, Bool -\fIonly_if_exists\fP\^); +Atom XInternAtom\^(\^Display *\fIdisplay\fP\^, const char *\fIatom_name\fP\^, +Bool \fIonly_if_exists\fP\^); .HP -Status XInternAtoms\^(\^Display *\fIdisplay\fP\^, char **\fInames\fP\^, int -\fIcount\fP\^, Bool \fIonly_if_exists\fP\^, Atom *\fIatoms_return\fP\^); +Status XInternAtoms\^(\^Display *\fIdisplay\fP\^, const char **\fInames\fP\^, +int \fIcount\fP\^, Bool \fIonly_if_exists\fP\^, Atom *\fIatoms_return\fP\^); .HP char *XGetAtomName\^(\^Display *\fIdisplay\fP\^, Atom \fIatom\fP\^); .HP diff --git a/specs/libX11/CH04.xml b/specs/libX11/CH04.xml index 8a3e8c53..e2bca721 100644 --- a/specs/libX11/CH04.xml +++ b/specs/libX11/CH04.xml @@ -1054,7 +1054,7 @@ To return an atom for a given name, use <funcprototype> <funcdef>Atom <function>XInternAtom</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> - <paramdef>char<parameter> *atom_name</parameter></paramdef> + <paramdef>const char<parameter> *atom_name</parameter></paramdef> <paramdef>Bool<parameter> only_if_exists</parameter></paramdef> </funcprototype> </funcsynopsis> @@ -1136,7 +1136,7 @@ To return atoms for an array of names, use <funcprototype> <funcdef>Status <function>XInternAtoms</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> - <paramdef>char<parameter> **names</parameter></paramdef> + <paramdef>const char<parameter> **names</parameter></paramdef> <paramdef>int<parameter> count</parameter></paramdef> <paramdef>Bool<parameter> only_if_exists</parameter></paramdef> <paramdef>Atom<parameter> *atoms_return</parameter></paramdef> diff --git a/src/IntAtom.c b/src/IntAtom.c index 7a562584..80d78c08 100644 --- a/src/IntAtom.c +++ b/src/IntAtom.c @@ -190,7 +190,7 @@ XInternAtom ( typedef struct { unsigned long start_seq; unsigned long stop_seq; - char **names; + const char **names; Atom *atoms; int count; Status status; @@ -239,7 +239,7 @@ Bool _XIntAtomHandler( Status XInternAtoms ( Display *dpy, - char **names, + const char **names, int count, Bool onlyIfExists, Atom *atoms_return) |