dix: replace AtomError() by better messages
Not used by any exteral drivers (and really should not be used by them), so can be replaced by more fitting error messages. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
parent
9d78e139a0
commit
39b0c088d5
10
dix/atom.c
10
dix/atom.c
|
@ -159,12 +159,6 @@ NameForAtom(Atom atom)
|
|||
return node->string;
|
||||
}
|
||||
|
||||
void
|
||||
AtomError(void)
|
||||
{
|
||||
FatalError("initializing atoms");
|
||||
}
|
||||
|
||||
static void
|
||||
FreeAtom(NodePtr patom)
|
||||
{
|
||||
|
@ -201,9 +195,9 @@ InitAtoms(void)
|
|||
tableLength = InitialTableSize;
|
||||
nodeTable = xallocarray(InitialTableSize, sizeof(NodePtr));
|
||||
if (!nodeTable)
|
||||
AtomError();
|
||||
FatalError("creating atom table");
|
||||
nodeTable[None] = NULL;
|
||||
MakePredeclaredAtoms();
|
||||
if (lastAtom != XA_LAST_PREDEFINED)
|
||||
AtomError();
|
||||
FatalError("builtin atom number mismatch");
|
||||
}
|
||||
|
|
|
@ -10,7 +10,7 @@ do_line() {
|
|||
local name="$1"
|
||||
[ "$2" != "@" ] && return 0
|
||||
echo " if (MakeAtom(\"$name\", ${#name}, 1) != XA_$name)"
|
||||
echo " AtomError();"
|
||||
echo " FatalError(\"adding builtin atom\");"
|
||||
}
|
||||
|
||||
cat > "$OUTPUT" << __END__
|
||||
|
|
|
@ -202,10 +202,6 @@ extern _X_EXPORT Bool ValidAtom(Atom /*atom */ );
|
|||
|
||||
extern _X_EXPORT const char *NameForAtom(Atom /*atom */ );
|
||||
|
||||
extern _X_EXPORT void
|
||||
AtomError(void)
|
||||
_X_NORETURN;
|
||||
|
||||
extern _X_EXPORT void
|
||||
FreeAllAtoms(void);
|
||||
|
||||
|
|
Loading…
Reference in New Issue