Attachment 2522 Details for Bug 3016 – hush-onceonly-error-1.patch

[patch] hush-onceonly-error-1.patch

hush-onceonly-error-1.patch (text/plain), 1.19 KB, created by Adam Jackson on 2005-04-23 12:14:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adam Jackson

Created: 2005-04-23 12:14:08 UTC

Size: 1.19 KB

patch

obsolete

>Index: programs/Xserver/hw/xfree86/loader/loadmod.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/loader/loadmod.c,v
>retrieving revision 1.2
>diff -u -d -r1.2 loadmod.c
>--- programs/Xserver/hw/xfree86/loader/loadmod.c	23 Apr 2004 19:54:06 -0000	1.2
>+++ programs/Xserver/hw/xfree86/loader/loadmod.c	23 Apr 2005 19:13:44 -0000
>@@ -1203,6 +1203,7 @@
> LoaderErrorMsg(const char *name, const char *modname, int errmaj, int errmin)
> {
>     const char *msg;
>+    MessageType type = X_ERROR;
> 
>     switch (errmaj) {
>     case LDR_NOERROR:
>@@ -1230,7 +1231,8 @@
> 	msg = "loader failed";
> 	break;
>     case LDR_ONCEONLY:
>-	msg = "once-only module";
>+	msg = "already loaded";
>+        type = X_INFO;
> 	break;
>     case LDR_NOPORTOPEN:
> 	msg = "port open failed";
>@@ -1257,10 +1259,10 @@
> 	msg = "uknown error";
>     }
>     if (name)
>-	xf86Msg(X_ERROR, "%s: Failed to load module \"%s\" (%s, %d)\n",
>+	xf86Msg(type, "%s: Failed to load module \"%s\" (%s, %d)\n",
> 		name, modname, msg, errmin);
>     else
>-	xf86Msg(X_ERROR, "Failed to load module \"%s\" (%s, %d)\n",
>+	xf86Msg(type, "Failed to load module \"%s\" (%s, %d)\n",
> 		modname, msg, errmin);
> }
>

Actions: View | Splinter Review

Attachments on bug 3016: 2522

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.