From 1a43b2279195e845e370d08c78151a8188a67560 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sat, 7 Nov 2009 06:40:09 -0500 Subject: [PATCH] Throw an error for unrecognized options in data files --- src/textual.cc | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/textual.cc b/src/textual.cc index 4b800ab2..8d4294a6 100644 --- a/src/textual.cc +++ b/src/textual.cc @@ -487,17 +487,8 @@ void instance_t::option_directive(char * line) *p++ = '\0'; } -#if 0 - if (! process_option(pathname.string(), line + 2, scope, p, line) && - ! dynamic_cast(&scope)) { - if (std::strlen(line + 2) == 1) - throw_(option_error, _("Illegal option -%1") << line + 2); - else - throw_(option_error, _("Illegal option --%1") << line + 2); - } -#else - process_option(pathname.string(), line + 2, scope, p, line); -#endif + if (! process_option(pathname.string(), line + 2, scope, p, line)) + throw_(option_error, _("Illegal option --%1") << line + 2); } void instance_t::automated_xact_directive(char * line)