X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=misc%2Fncu-indent;h=95ed4334ce7c5f999cde54e96b0b43b11d28eb64;hp=671f7574f7761b6abf8ee556836b7745c26af89a;hb=d96f3e9b8a422f6daa2101d4d165801421312aa0;hpb=4573ed8af000c7a7907a59ec750da29c46c15498

diff --git a/misc/ncu-indent b/misc/ncu-indent
index 671f7574..95ed4334 100755
--- a/misc/ncu-indent
+++ b/misc/ncu-indent
@@ -1,6 +1,6 @@
 #!/bin/sh
 #****************************************************************************
-#* Copyright (c) 2001-2006,2008 Thomas E. Dickey                            *
+#* Copyright (c) 2001-2009,2010 Thomas E. Dickey                            *
 #*                                                                          *
 #* Permission is hereby granted, free of charge, to any person obtaining a  *
 #* copy of this software and associated documentation files (the            *
@@ -26,7 +26,7 @@
 #* sale, use or other dealings in this Software without prior written       *
 #* authorization.                                                           *
 #****************************************************************************/
-# $Id: ncu-indent,v 1.20 2009/02/21 20:56:23 tom Exp $
+# $Id: ncu-indent,v 1.21 2010/07/24 11:25:18 tom Exp $
 NOOP=no
 OPTS='
 --blank-lines-after-procedures
@@ -92,9 +92,9 @@ do
 			-e '/EMPTY_MODULE(/s/)$/);/' \
 			-e 's,\(MODULEID(\),//\1,' \
 			-e '/MODULE_ID(/s/)$/);/' \
-			-e 's,\<GCC_NORETURN;,;//GCC_NORETURN;,' \
-			-e 's,\<GCC_PRINTFLIKE(,;//GCC_PRINTFLIKE(,' \
-			-e 's,\<GCC_SCANFLIKE(,;//GCC_SCANFLIKE(,' \
+			-e 's,\<GCC_NORETURN\(.*\);,;//GCC_NORETURN\1,' \
+			-e 's,\<GCC_PRINTFLIKE(\(.*\);,;//GCC_PRINTFLIKE(\1,' \
+			-e 's,\<GCC_SCANFLIKE(\(.*\);,;//GCC_SCANFLIKE(\1,' \
 			-e 's,\(\<NCURSES_EXPORT_VAR\>.*;\),//\1,' \
 			"$save" >"$test"
 		cp "$test" "$name"
@@ -105,9 +105,11 @@ do
 			-e '/EMPTY_MODULE(/s/);$/)/' \
 			-e 's,//\(MODULEID(\),\1,' \
 			-e '/MODULE_ID(/s/);$/)/' \
-			-e 's,;[ 	]*//GCC_NORETURN;, GCC_NORETURN;,' \
-			-e 's,;[ 	]*//GCC_PRINTFLIKE(, GCC_PRINTFLIKE(,' \
-			-e 's,;[ 	]*//GCC_SCANFLIKE(, GCC_SCANFLIKE(,' \
+			-e 's,;[ 	]*//GCC_NORETURN\(.*\);, GCC_NORETURN\1;,' \
+			-e 's,;[ 	]*//GCC_PRINTFLIKE(\(.*\);, GCC_PRINTFLIKE(\1;,' \
+			-e 's,;[ 	]*//GCC_SCANFLIKE(\(.*\);, GCC_SCANFLIKE(\1;,' \
+			-e 's,;[	]*//\(.*\), \1;,' \
+			-e 's,[ 	][	]*\<GCC_, GCC_,g' \
 			-e 's,//\(\<NCURSES_EXPORT_VAR\>[ ]*\),\1,' \
 			"$name" >"$test"
 		mv "$test" "$name"