Merge branch 'gawk-4.1-stable'

2 files changed, 2 insertions, 37 deletions

diff --git a/ChangeLog b/ChangeLog
index cc15ccbf..2e784a60 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2015-03-08         Arnold D. Robbins     <arnold@skeeve.com>
 
+	* re.c (regexflags2str): Removed. It was redundant.
+
 	* io.c (devopen): Change the logic such that if nonfatal is true
 	for the socket, don't do retries.  Also clean up the formatting
 	some.  At strictopen, check if errno is ENOENT and if so, propagate
diff --git a/re.c b/re.c
index edb5bc48..7abb9430 100644
--- a/re.c
+++ b/re.c
@@ -616,40 +616,3 @@ again:
 done:
 	s[length] = save;
 }
-
-/* regexflags2str --- make regex flags printable */
-
-const char *
-regexflags2str(int flags)
-{
-	static const struct flagtab regextab[] = {
-		{ RE_BACKSLASH_ESCAPE_IN_LISTS,	"RE_BACKSLASH_ESCAPE_IN_LISTS" },
-		{ RE_BK_PLUS_QM,		"RE_BK_PLUS_QM" },
-		{ RE_CHAR_CLASSES,		"RE_CHAR_CLASSES" },
-		{ RE_CONTEXT_INDEP_ANCHORS,	"RE_CONTEXT_INDEP_ANCHORS" },
-		{ RE_CONTEXT_INDEP_OPS,		"RE_CONTEXT_INDEP_OPS" },
-		{ RE_CONTEXT_INVALID_OPS,	"RE_CONTEXT_INVALID_OPS" },
-		{ RE_DOT_NEWLINE,		"RE_DOT_NEWLINE" },
-		{ RE_DOT_NOT_NULL,		"RE_DOT_NOT_NULL" },
-		{ RE_HAT_LISTS_NOT_NEWLINE,	"RE_HAT_LISTS_NOT_NEWLINE" },
-		{ RE_INTERVALS,			"RE_INTERVALS" },
-		{ RE_LIMITED_OPS,		"RE_LIMITED_OPS" },
-		{ RE_NEWLINE_ALT,		"RE_NEWLINE_ALT" },
-		{ RE_NO_BK_BRACES,		"RE_NO_BK_BRACES" },
-		{ RE_NO_BK_PARENS,		"RE_NO_BK_PARENS" },
-		{ RE_NO_BK_REFS,		"RE_NO_BK_REFS" },
-		{ RE_NO_BK_VBAR,		"RE_NO_BK_VBAR" },
-		{ RE_NO_EMPTY_RANGES,		"RE_NO_EMPTY_RANGES" },
-		{ RE_UNMATCHED_RIGHT_PAREN_ORD,	"RE_UNMATCHED_RIGHT_PAREN_ORD" },
-		{ RE_NO_POSIX_BACKTRACKING,	"RE_NO_POSIX_BACKTRACKING" },
-		{ RE_NO_GNU_OPS,		"RE_NO_GNU_OPS" },
-		{ RE_DEBUG,			"RE_DEBUG" },
-		{ RE_INVALID_INTERVAL_ORD,	"RE_INVALID_INTERVAL_ORD" },
-		{ RE_ICASE,			"RE_ICASE" },
-		{ RE_CARET_ANCHORS_HERE,	"RE_CARET_ANCHORS_HERE" },
-		{ RE_CONTEXT_INVALID_DUP,	"RE_CONTEXT_INVALID_DUP" },
-		{ 0,				NULL }
-	};
-
-	return genflags2str(flags, regextab);
-}