X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=misc%2Fjpf-indent;h=cdd825c61d37ea2dcecacd1912cb25f0223b7b0d;hp=17f860fd42e3ffa2b7429ba318a584e034ae782c;hb=ca5fdd32fd43d84fe3d720cd5c07fba28fc506a4;hpb=55ccd2b959766810cf7db8d1c4462f338ce0afc8

diff --git a/misc/jpf-indent b/misc/jpf-indent
index 17f860fd..cdd825c6 100755
--- a/misc/jpf-indent
+++ b/misc/jpf-indent
@@ -1,5 +1,32 @@
 #!/bin/sh
-# $Id: jpf-indent,v 1.3 2004/05/29 19:14:45 tom Exp $
+#****************************************************************************
+#* Copyright (c) 2004-2005,2006 Thomas E. Dickey                            *
+#*                                                                          *
+#* Permission is hereby granted, free of charge, to any person obtaining a  *
+#* copy of this software and associated documentation files (the            *
+#* "Software"), to deal in the Software without restriction, including      *
+#* without limitation the rights to use, copy, modify, merge, publish,      *
+#* distribute, distribute with modifications, sublicense, and/or sell       *
+#* copies of the Software, and to permit persons to whom the Software is    *
+#* furnished to do so, subject to the following conditions:                 *
+#*                                                                          *
+#* The above copyright notice and this permission notice shall be included  *
+#* in all copies or substantial portions of the Software.                   *
+#*                                                                          *
+#* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
+#* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
+#* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
+#* IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
+#* DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
+#* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
+#* THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
+#*                                                                          *
+#* Except as contained in this notice, the name(s) of the above copyright   *
+#* holders shall not be used in advertising or otherwise to promote the     *
+#* sale, use or other dealings in this Software without prior written       *
+#* authorization.                                                           *
+#****************************************************************************/
+# $Id: jpf-indent,v 1.6 2006/02/18 17:07:15 tom Exp $
 # indent ncurses source written by Juergen Pfeifer
 NOOP=no
 OPTS='
@@ -16,11 +43,12 @@ OPTS='
 --parameter-indentation4
 --swallow-optional-blank-lines
 --tab-size8
+
 -T FIELD
 -T FIELDTYPE
 -T FIELD_CELL
 -T FORM
--T INLINE
+-T NCURSES_INLINE
 -T RegExp_Arg 
 -T TypeArgument 
 -T WINDOW
@@ -50,15 +78,19 @@ do
 		sed \
 			-e '/MODULE_ID(/s/)$/);/' \
 			-e 's,\<GCC_NORETURN;,;//GCC_NORETURN;,' \
+			-e 's,\<GCC_PRINTFLIKE(,;//GCC_PRINTFLIKE(,' \
+			-e 's,\<GCC_SCANFLIKE(,;//GCC_SCANFLIKE(,' \
 			-e 's,\(\<NCURSES_EXPORT_VAR\>\),//\1,' \
 			"$save" >"$test"
 		cp "$test" "$name"
 		chmod u+w "$name"
 		# ${INDENT_PROG-indent} --version
-		${INDENT_PROG-indent} $OPTS "$name"
+		${INDENT_PROG-indent} -npro $OPTS "$name"
 		sed \
 			-e '/MODULE_ID(/s/);$/)/' \
 			-e 's,;[ 	]*//GCC_NORETURN;, GCC_NORETURN;,' \
+			-e 's,;[ 	]*//GCC_PRINTFLIKE(, GCC_PRINTFLIKE(,' \
+			-e 's,;[ 	]*//GCC_SCANFLIKE(, GCC_SCANFLIKE(,' \
 			-e 's,//\(\<NCURSES_EXPORT_VAR\>\),\1,' \
 			"$name" >"$test"
 		mv "$test" "$name"