andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bug #3016: Don't complain as loudly about failing to load a module that's

Browse Source 
already loaded.
This commit is contained in:
Adam Jackson 2005-04-23 19:16:10 +00:00
parent 139f900c56
commit 39eb279718
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/xfree86/loader/loadmod.c
View File

@ -1203,6 +1203,7 @@ void
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 @@ LoaderErrorMsg(const char *name, const char *modname, int errmaj, int errmin)
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 @@ LoaderErrorMsg(const char *name, const char *modname, int errmaj, int errmin)
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);
}