Merged this branch with the one in the splint.sf.net repository.

[splint.git] / src / Headers / flags.h

diff --git a/src/Headers/flags.h b/src/Headers/flags.h
index 4cf14a22db57efe4fadd43e183ed3f7482ff46c3..8bb783edc0f28805680211e757360bee48cfc913 100644 (file)
--- a/src/Headers/flags.h
+++ b/src/Headers/flags.h
@@ -63,9 +63,6 @@ extern bool flagcode_isInvalid (flagcode p_f) /*@*/ ;
 extern bool flagcode_isSkip (flagcode p_f) /*@*/ ;
 # define flagcode_isSkip(f) ((f) == SKIP_FLAG)
 
-extern bool flagcode_isModeName (flagcode p_f) /*@*/ ;
-# define flagcode_isModeName(f) ((f) == MODENAME_FLAG)
-
 extern bool flagcode_isValid (flagcode p_f) /*@*/ ;
 # define flagcode_isValid(f) ((f) != INVALID_FLAG)
 
@@ -91,7 +88,9 @@ extern bool flagcode_hasArgument (flagcode p_f) /*@*/ ;
 /*@constant observer cstring DEFAULT_MODE;@*/
 # define DEFAULT_MODE (cstring_makeLiteralTemp ("standard"))
 
-extern bool flags_isModeName (cstring p_s) /*@*/ ;
+extern void flags_initMod (void) /*@modifies internalState@*/ ;
+
+extern bool isMode (cstring p_s) /*@*/ ;
 extern /*@only@*/ cstring describeModes (void) /*@modifies g_messagestream@*/ ;
 extern void summarizeErrors (void) /*@modifies g_messagestream@*/ ;
 
@@ -101,21 +100,7 @@ extern bool flagcode_isModeFlag (flagcode p_f) /*@*/ ;
 extern bool flagcode_isSpecialFlag (flagcode p_f) /*@*/ ;
 extern bool flagcode_isGlobalFlag (flagcode p_f) /*@*/ ;
 extern bool flagcode_isMessageControlFlag (flagcode p_f) /*@*/ ;
-extern bool flagcode_isHelpFlag (flagcode p_f) /*@*/ ;
-
-extern void flags_initMod (void) /*@modifies internalState@*/ ;
-
-extern void
-flags_processFlags (bool p_inCommandLine, 
-                   fileIdList p_xfiles,
-                   fileIdList p_cfiles,
-                   fileIdList p_lclfiles,
-                   fileIdList p_mtfiles,
-                   cstringSList *p_passThroughArgs,
-                   int p_argc, /*@null@*/ char **p_argv)
-     /*@requires maxRead(p_argv) >= (p_argc - 1) @*/
-     /* returns true if normal, false if execution should exit */ ;
-
+ 
 # else
 # error "Multiple include"
 # endif