diff options
| author | Adam Jackson <ajax@nwnk.net> | 2005-04-23 19:16:10 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2005-04-23 19:16:10 +0000 |
| commit | 39eb2797183bf871a2dd01bff63dd35c146471f5 (patch) | |
| tree | db0a56aab2f8ac259122ce917f9637cf5ce4af6f /hw | |
| parent | 139f900c56a6f44df2b411fe4bbc025a147e3abe (diff) | |
| download | xserver-39eb2797183bf871a2dd01bff63dd35c146471f5.tar.gz | |
Bug #3016: Don't complain as loudly about failing to load a module that's
already loaded.
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/xfree86/loader/loadmod.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c index 4bf36a38a..5047bbf03 100644 --- a/hw/xfree86/loader/loadmod.c +++ b/hw/xfree86/loader/loadmod.c @@ -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); } |