Merge pull request #4172 from masatake/misc-fixes

@masatake Tmain: specify --quiet --options=NONE in some run.sh scripts 8d011ec @masatake main,comment: fix a wrong English sentence b95d9f7 @masatake main: specify the type of a local variable explicitly bbbb923
universal-ctags · Jan 7, 2025 · ddd08d2 · ddd08d2
2 parents 1f657af + bbbb923
commit ddd08d2
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/Tmain/common-prelude.d/run.sh b/Tmain/common-prelude.d/run.sh
@@ -23,7 +23,7 @@ for t in $(ls *.ps); do
     printf "%s" "${t}..."
 
 	{
-		${CTAGS} --_dump-prelude
+		${CTAGS} --quiet --options=NONE --_dump-prelude
 		echo
 		cat $t
 	} > $i

diff --git a/Tmain/epoch-field.d/run.sh b/Tmain/epoch-field.d/run.sh
@@ -52,5 +52,5 @@ run()
 	return $s
 }
 
-run $O0 ".c file" && run $O1 ".h file" && run $O2 ".m file" -G
+run $O0 ".c file" --quiet --options=NONE && run $O1 ".h file" --quiet --options=NONE  && run $O2 ".m file" --quiet --options=NONE -G
 exit $?
diff --git a/Tmain/roles-field-optscript.d/run.sh b/Tmain/roles-field-optscript.d/run.sh
@@ -2,4 +2,4 @@
 # License: GPL-2
 CTAGS=$1
 
-${CTAGS} --quiet --options=foo.ctags -o - input.foo | grep -v '^a'
+${CTAGS} --quiet --options=NONE --options=foo.ctags -o - input.foo | grep -v '^a'
diff --git a/Tmain/run-as-etags.d/run.sh b/Tmain/run-as-etags.d/run.sh
@@ -16,7 +16,7 @@ exit_if_win32 "$CTAGS"
 etags=$BUILDDIR/etags
 cp $1 $etags
 
-$etags --_force-quit
+$etags --quiet --options=NONE --_force-quit
 r=$?
 
 rm $etags

diff --git a/Tmain/trace-option.d/run.sh b/Tmain/trace-option.d/run.sh
@@ -9,5 +9,5 @@ CTAGS=$1
 is_feature_available $CTAGS debug
 
 # For comparison the output and the expectation, sed removes signature parts from the output.
-$CTAGS --_trace=CTagsSelfTest --language-force=CTagsSelfTest ./input.unknown
+$CTAGS --quiet --options=NONE --_trace=CTagsSelfTest --language-force=CTagsSelfTest ./input.unknown
 exit $?
diff --git a/Tmain/version-option.d/run.sh b/Tmain/version-option.d/run.sh
@@ -3,4 +3,4 @@
 
 CTAGS="$1"
 
-$CTAGS --version=C
+$CTAGS --quiet --options=NONE --version=C
diff --git a/main/entry.h b/main/entry.h
@@ -348,7 +348,7 @@ extern void resetTagCorkState (tagEntryInfo *const tag,
  * If VALUE points "" (empty C string), the json writer prints it as
  * false, and the xref writer prints it as -.
  * If VALUE points a non-empty C string, Both json writer and xref
- * writer print it as-is.
+ * writers print it as-is.
  *
  * For FIELDTYPE_BOOL
  * The json writer always prints true.

diff --git a/main/fmt.c b/main/fmt.c
@@ -55,7 +55,7 @@ static int printTagField (fmtSpec* fspec, MIO* fp, const tagEntryInfo * tag)
 {
 	int i;
 	int width = fspec->field.width;
-	int ftype;
+	fieldType ftype;
 	const char* str = NULL;
 
 	ftype = fspec->field.ftype;
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,7 +23,7 @@ for t in $(ls *.ps); do @@
         printf "%s" "${t}..."
     	{
-    		${CTAGS} --_dump-prelude
+    		${CTAGS} --quiet --options=NONE --_dump-prelude
     		echo
     		cat $t
     	} > $i
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,4 +3,4 @@

		CTAGS="$1"

		$CTAGS --version=C
		$CTAGS --quiet --options=NONE --version=C