Attachment 111747 Details for Bug 88035 – xorg-server-1.12-unloadsubmodule.patch

[patch] xorg-server-1.12-unloadsubmodule.patch

xorg-server-1.12-unloadsubmodule.patch (text/plain), 1.34 KB, created by Kyle Blake on 2015-01-05 03:29:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle Blake

Created: 2015-01-05 03:29:39 UTC

Size: 1.34 KB

patch

obsolete

>diff -u13 -r xorg-server-1.12.3-old/hw/xfree86/loader/loadmod.c xorg-server-1.12.3/hw/xfree86/loader/loadmod.c
>--- xorg-server-1.12.3-old/hw/xfree86/loader/loadmod.c	2012-09-05 18:26:42.000000000 +0200
>+++ xorg-server-1.12.3/hw/xfree86/loader/loadmod.c	2012-09-05 18:28:54.000000000 +0200
>@@ -1109,39 +1109,38 @@
> 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;
>-        return;
>-    }
>-
>-    prevsib = parent->child;
>-    mdp = prevsib->sib;
>-    while (mdp && mdp != child) {
>-        prevsib = mdp;
>-        mdp = mdp->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:

Actions: View | Splinter Review

Attachments on bug 88035: 111743 | 111746 | 111747

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.