Checked in all major updates.

1 files changed, 12 insertions, 21 deletions

diff --git a/option.h b/option.h
index 6de6ac91..1acc20e9 100644
--- a/option.h
+++ b/option.h
@@ -5,20 +5,14 @@
 #include <string>
 #include <exception>
 
-struct option_handler {
-  bool handled;
-  option_handler() : handled(false) {}
-  virtual ~option_handler() {}
-  virtual void operator()(const char * arg = NULL) = 0;
-};
+typedef void (*handler_t)(const char * arg);
 
 struct option_t {
-  char		   short_opt;
-  std::string	   long_opt;
-  bool		   wants_arg;
-  option_handler * handler;
-
-  option_t() : short_opt(0), wants_arg(false), handler(NULL) {}
+  const char * long_opt;
+  char	       short_opt;
+  bool	       wants_arg;
+  handler_t    handler;
+  bool         handled;
 };
 
 class option_error : public std::exception {
@@ -32,14 +26,11 @@ class option_error : public std::exception {
   }
 };
 
-void add_option_handler(std::list<option_t>& options, const std::string& label,
-			const std::string& opt_chars, option_handler& option);
-bool process_option(std::list<option_t>& options,
-		    const std::string& opt, const char * arg = NULL);
-void process_arguments(std::list<option_t>& options,
-		       int argc, char ** argv, const bool anywhere,
-		       std::list<std::string>& args);
-void process_environment(std::list<option_t>& options,
-			 char ** envp, const std::string& tag);
+bool process_option(option_t * options, const std::string& opt,
+		    const char * arg = NULL);
+void process_arguments(option_t * options, int argc, char ** argv,
+		       const bool anywhere, std::list<std::string>& args);
+void process_environment(option_t * options, char ** envp,
+			 const std::string& tag);
 
 #endif // _OPTION_H