From 9c3669c6b7ff19013b3684bb74d98ec3d121e329 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 27 Feb 2017 13:52:29 +0000 Subject: Xserver/dix/atom.c (et al.): Constify atom name strings. Inspired by X.org commits: commit 08093c25a91c07ab8af7cece9bba738b827cfd1b Author: Alan Coopersmith Date: Mon Oct 24 23:16:30 2011 -0700 Convert some malloc + strncpy pairs into strndup calls Signed-off-by: Alan Coopersmith Reviewed-by: Jeremy Huddleston commit 816b79dd061e9839cec94a4986a7820b70ca8a7f Author: Mikhail Gusarov Date: Thu May 13 03:45:21 2010 +0700 Remove useless casts Signed-off-by: Mikhail Gusarov Reviewed-by: Keith Packard This PR ships a tiny change in MakeAtom, that we adopted. We did not adopt the full commit. commit 5623c27700b7b23a8dbbd8c8f45e5d4fa0c667e3 Author: Alan Coopersmith Date: Mon Feb 2 19:25:14 2009 -0800 Constify atom name strings Changes MakeAtom to take a const char * and NameForAtom to return them, since many callers pass pointers to constant strings stored in read-only ELF sections. Updates in-tree callers as necessary to clear const mismatch warnings introduced by this change. Signed-off-by: Alan Coopersmith Acked-by: Peter Hutterer Backported-to-NX-by: Mike Gabriel --- nx-X11/programs/Xserver/hw/nxagent/Atoms.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'nx-X11/programs/Xserver/hw/nxagent/Atoms.c') diff --git a/nx-X11/programs/Xserver/hw/nxagent/Atoms.c b/nx-X11/programs/Xserver/hw/nxagent/Atoms.c index 8f43dce4d..0784d6c2c 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Atoms.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Atoms.c @@ -336,7 +336,7 @@ int nxagentQueryAtoms(ScreenPtr pScreen) typedef struct { Atom local; Atom remote; - char *string; + const char *string; int length; } AtomMap; @@ -345,7 +345,7 @@ static unsigned int privAtomMapSize = 0; static unsigned int privLastAtom = 0; static void nxagentExpandCache(void); -static void nxagentWriteAtom(Atom, Atom, char*, Bool); +static void nxagentWriteAtom(Atom, Atom, const char*, Bool); static AtomMap* nxagentFindAtomByRemoteValue(Atom); static AtomMap* nxagentFindAtomByLocalValue(Atom); static AtomMap* nxagentFindAtomByName(char*, unsigned); @@ -368,9 +368,9 @@ static void nxagentExpandCache(void) * then cache the atom-couple. */ -static void nxagentWriteAtom(Atom local, Atom remote, char *string, Bool duplicate) +static void nxagentWriteAtom(Atom local, Atom remote, const char *string, Bool duplicate) { - char *s; + const char *s; /* * We could remove this string duplication if @@ -460,7 +460,7 @@ static int nxagentInitAtomMap(char **atomNameList, int count, Atom *atomsRet) for (i = 0; i < privLastAtom; i++) { - name_list[count + i] = privAtomMap[i].string; + name_list[count + i] = (char *)privAtomMap[i].string; atom_list[count + i] = None; } @@ -670,7 +670,7 @@ Atom nxagentMakeAtom(char *string, unsigned int length, Bool Makeit) Atom nxagentLocalToRemoteAtom(Atom local) { AtomMap *current; - char *string; + const char *string; Atom remote; if (!ValidAtom(local)) -- cgit v1.2.3