frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loader: Remove unused loader error codes and dead enum 

The enum has been unused since at least the removal of elfloader.

Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Adam Jackson 2016-03-01 08:29:06 -05:00
parent 7e3cccf8e4
commit ef533a912d
2 changed files with 1 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hw/xfree86/common/xf86Module.h
View File

@ -49,13 +49,6 @@
#define NULL ((void *)0) #define NULL ((void *)0)
#endif #endif
typedef enum {
LD_RESOLV_IFDONE = 0, /* only check if no more
delays pending */
LD_RESOLV_NOW = 1, /* finish one delay step */
LD_RESOLV_FORCE = 2 /* force checking... */
} LoaderResolveOptions;
#define DEFAULT_LIST ((char *)-1) #define DEFAULT_LIST ((char *)-1)
/* Built-in ABI classes. These definitions must not be changed. */ /* Built-in ABI classes. These definitions must not be changed. */
@ -92,19 +85,13 @@ typedef enum {
#define MODULEVENDORSTRING "X.Org Foundation" #define MODULEVENDORSTRING "X.Org Foundation"
#endif #endif
/* Error return codes for errmaj. New codes must only be added at the end. */ /* Error return codes for errmaj */
typedef enum { typedef enum {
LDR_NOERROR = 0, LDR_NOERROR = 0,
LDR_NOMEM, /* memory allocation failed */ LDR_NOMEM, /* memory allocation failed */
LDR_NOENT, /* Module file does not exist */ LDR_NOENT, /* Module file does not exist */
LDR_NOSUBENT, /* pre-requsite file to be sub-loaded does not exist */
LDR_NOSPACE, /* internal module array full */
LDR_NOMODOPEN, /* module file could not be opened (check errmin) */
LDR_UNKTYPE, /* file is not a recognized module type */
LDR_NOLOAD, /* type specific loader failed */ LDR_NOLOAD, /* type specific loader failed */
LDR_ONCEONLY, /* Module should only be loaded once (not an error) */ LDR_ONCEONLY, /* Module should only be loaded once (not an error) */
LDR_NOPORTOPEN, /* could not open port (check errmin) */
LDR_NOHARDWARE, /* could not query/initialize the hardware device */
LDR_MISMATCH, /* the module didn't match the spec'd requirments */ LDR_MISMATCH, /* the module didn't match the spec'd requirments */
LDR_BADUSAGE, /* LoadModule is called with bad arguments */ LDR_BADUSAGE, /* LoadModule is called with bad arguments */
LDR_INVALID, /* The module doesn't have a valid ModuleData object */ LDR_INVALID, /* The module doesn't have a valid ModuleData object */

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

@ -1094,18 +1094,6 @@ LoaderErrorMsg(const char *name, const char *modname, int errmaj, int errmin)
case LDR_NOENT: case LDR_NOENT:
msg = "module does not exist"; msg = "module does not exist";
break; break;
case LDR_NOSUBENT:
msg = "a required submodule could not be loaded";
break;
case LDR_NOSPACE:
msg = "too many modules";
break;
case LDR_NOMODOPEN:
msg = "open failed";
break;
case LDR_UNKTYPE:
msg = "unknown module type";
break;
case LDR_NOLOAD: case LDR_NOLOAD:
msg = "loader failed"; msg = "loader failed";
break; break;
@ -1113,12 +1101,6 @@ LoaderErrorMsg(const char *name, const char *modname, int errmaj, int errmin)
msg = "already loaded"; msg = "already loaded";
type = X_INFO; type = X_INFO;
break; break;
case LDR_NOPORTOPEN:
msg = "port open failed";
break;
case LDR_NOHARDWARE:
msg = "no hardware found";
break;
case LDR_MISMATCH: case LDR_MISMATCH:
msg = "module requirement mismatch"; msg = "module requirement mismatch";
break; break;