diff options
Diffstat (limited to 'isys')
| -rw-r--r-- | isys/isys.h | 6 | ||||
| -rw-r--r-- | isys/moduleinfo.c | 21 |
2 files changed, 11 insertions, 16 deletions
diff --git a/isys/isys.h b/isys/isys.h index ae0317396..f91ba47c2 100644 --- a/isys/isys.h +++ b/isys/isys.h @@ -12,8 +12,6 @@ struct moduleArg { }; #define MI_FLAG_NOMISCARGS (1 << 0) -enum miLocationTypes { MI_LOCATION_NONE, MI_LOCATION_DISKNAME, - MI_LOCATION_DIRECTORY }; struct moduleInfo { char * moduleName; @@ -23,7 +21,6 @@ struct moduleInfo { int numArgs; struct moduleArg * args; int flags; - enum miLocationTypes location; void * locationID; }; @@ -36,8 +33,7 @@ typedef struct moduleInfoSet_s * moduleInfoSet; moduleInfoSet isysNewModuleInfoSet(void); void isysFreeModuleInfoSet(moduleInfoSet mis); -int isysReadModuleInfo(const char * filename, moduleInfoSet mis, - enum miLocationTypes identType, void * path); +int isysReadModuleInfo(const char * filename, moduleInfoSet mis, void * path); struct moduleInfo * isysFindModuleInfo(moduleInfoSet mis, const char * moduleName); diff --git a/isys/moduleinfo.c b/isys/moduleinfo.c index 96b556ab9..5eadbdb3d 100644 --- a/isys/moduleinfo.c +++ b/isys/moduleinfo.c @@ -56,8 +56,7 @@ moduleInfoSet isysNewModuleInfoSet(void) { return calloc(sizeof(struct moduleInfoSet_s), 1); } -int isysReadModuleInfo(const char * filename, moduleInfoSet mis, - enum miLocationTypes identType, void * ident) { +int isysReadModuleInfo(const char * filename, moduleInfoSet mis, void * ident) { int fd, isIndented; char * buf, * start, * next, * chptr; struct stat sb; @@ -125,15 +124,15 @@ int isysReadModuleInfo(const char * filename, moduleInfoSet mis, nextModule = mis->moduleList + mis->numModules; nextModule->moduleName = strdup(start); - nextModule->major = DRIVER_NONE; - nextModule->minor = DRIVER_MINOR_NONE; - nextModule->description = NULL; - nextModule->flags = 0; - nextModule->args = NULL; - nextModule->numArgs = 0; - nextModule->location = identType; - nextModule->locationID = ident; - } + } + + nextModule->major = DRIVER_NONE; + nextModule->minor = DRIVER_MINOR_NONE; + nextModule->description = NULL; + nextModule->flags = 0; + nextModule->args = NULL; + nextModule->numArgs = 0; + nextModule->locationID = ident; } else if (!nextModule) { /* ACK! syntax error */ return 1; |