From 8d011ecdd162d056943dea5e39828d501c91a1e8 Mon Sep 17 00:00:00 2001 From: Masatake YAMATO Date: Tue, 7 Jan 2025 06:26:33 +0900 Subject: [PATCH 1/3] Tmain: specify --quiet --options=NONE in some run.sh scripts --- Tmain/common-prelude.d/run.sh | 2 +- Tmain/epoch-field.d/run.sh | 2 +- Tmain/roles-field-optscript.d/run.sh | 2 +- Tmain/run-as-etags.d/run.sh | 2 +- Tmain/trace-option.d/run.sh | 2 +- Tmain/version-option.d/run.sh | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Tmain/common-prelude.d/run.sh b/Tmain/common-prelude.d/run.sh index 837ebcae16..f04f8a24a8 100644 --- 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 index d04c64f9df..f059ad9d46 100644 --- 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 index 67101d436e..dd0b3fce64 100644 --- 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 index 71e4e0e266..988e0e11c2 100644 --- 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 index 5ff9dd0afb..ca85e80822 100644 --- 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 index 140f19730f..f4aa05697a 100644 --- 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 From b95d9f74582ec0e33173f13fb35f179de062b5ff Mon Sep 17 00:00:00 2001 From: Masatake YAMATO Date: Thu, 2 Jan 2025 17:09:07 +0900 Subject: [PATCH 2/3] main,comment: fix a wrong English sentence Signed-off-by: Masatake YAMATO --- main/entry.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/entry.h b/main/entry.h index ede0925e7c..ff3b9581f0 100644 --- 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. From bbbb9239c929b66abb62e73869730fb5f4b97d60 Mon Sep 17 00:00:00 2001 From: Masatake YAMATO Date: Thu, 2 Jan 2025 17:57:20 +0900 Subject: [PATCH 3/3] main: specify the type of a local variable explicitly Signed-off-by: Masatake YAMATO --- main/fmt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/fmt.c b/main/fmt.c index 8d4952b35f..b8d3357ed8 100644 --- 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;