Attachment #335002 for bug #447152




static void
RemoveChild(ModuleDescPtr child)
{
    ModuleDescPtr mdp;
    ModuleDescPtr prevsib;
    ModuleDescPtr parent;

    if (!child->parent)
        return;

    parent = child->parent;
    if (parent->child == child) {
        parent->child = child->sib;
    }
    else {
        prevsib = parent->child;
        mdp = prevsib->sib;
        while (mdp && mdp != child) {
            prevsib = mdp;
            mdp = mdp->sib;
        }
        if (mdp == child)
            prevsib->sib = child->sib;
    }
    if (mdp == child)
        prevsib->sib = child->sib;
    child->sib = NULL;
    return;
}

void
LoaderErrorMsg(const char *name, const char *modname, int errmaj, int errmin)
{
    const char *msg;
    MessageType type = X_ERROR;

    switch (errmaj) {
    case LDR_NOERROR:
        msg = "no error";
        break;
    case LDR_NOMEM:

Return to bug 447152

Lines 1109-1147 Link Here

(-)xorg-server-1.12.3-old/hw/xfree86/loader/loadmod.c (-11 / +10 lines)
1109	static void	1109	static void
1110	RemoveChild(ModuleDescPtr child)	1110	RemoveChild(ModuleDescPtr child)
1111	{	1111	{
1112	ModuleDescPtr mdp;	1112	ModuleDescPtr mdp;
1113	ModuleDescPtr prevsib;	1113	ModuleDescPtr prevsib;
1114	ModuleDescPtr parent;	1114	ModuleDescPtr parent;
1115		1115
1116	if (!child->parent)	1116	if (!child->parent)
1117	return;	1117	return;
1118		1118
1119	parent = child->parent;	1119	parent = child->parent;
1120	if (parent->child == child) {	1120	if (parent->child == child) {
1121	parent->child = child->sib;	1121	parent->child = child->sib;
1122	return;	1122	}
1123	}	1123	else {
1124		1124	prevsib = parent->child;
1125	prevsib = parent->child;	1125	mdp = prevsib->sib;
1126	mdp = prevsib->sib;	1126	while (mdp && mdp != child) {
1127	while (mdp && mdp != child) {	1127	prevsib = mdp;
1128	prevsib = mdp;	1128	mdp = mdp->sib;
1129	mdp = mdp->sib;	1129	}
		1130	if (mdp == child)
		1131	prevsib->sib = child->sib;
1130	}	1132	}
1131	if (mdp == child)
1132	prevsib->sib = child->sib;
1133	child->sib = NULL;	1133	child->sib = NULL;
1134	return;
1135	}	1134	}
1136		1135
1137	void	1136	void
1138	LoaderErrorMsg(const char name, const char modname, int errmaj, int errmin)	1137	LoaderErrorMsg(const char name, const char modname, int errmaj, int errmin)
1139	{	1138	{
1140	const char *msg;	1139	const char *msg;
1141	MessageType type = X_ERROR;	1140	MessageType type = X_ERROR;
1142		1141
1143	switch (errmaj) {	1142	switch (errmaj) {
1144	case LDR_NOERROR:	1143	case LDR_NOERROR:
1145	msg = "no error";	1144	msg = "no error";
1146	break;	1145	break;
1147	case LDR_NOMEM:	1146	case LDR_NOMEM: