| Message ID | 20200917075029.313-5-zhaolichang@huawei.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | fix some comment spelling errors | expand |
Le 17/09/2020 à 09:50, zhaolichang a écrit : > I found that there are many spelling errors in the comments of qemu, > so I used the spellcheck tool to check the spelling errors > and finally found some spelling errors in the scripts folder. > > Signed-off-by: zhaolichang <zhaolichang@huawei.com> > Reviewed-by: Peter Maydell <peter.maydell@linaro.org> > --- > scripts/checkpatch.pl | 2 +- > scripts/clean-header-guards.pl | 2 +- > scripts/decodetree.py | 6 +++--- > scripts/oss-fuzz/build.sh | 2 +- > scripts/tracetool/__init__.py | 2 +- > 5 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl > index bd3faa154c..50910899f2 100755 > --- a/scripts/checkpatch.pl > +++ b/scripts/checkpatch.pl > @@ -1870,7 +1870,7 @@ sub process { > substr($s, 0, length($c), ''); > > # Make sure we remove the line prefixes as we have > - # none on the first line, and are going to readd them > + # none on the first line, and are going to re-add them > # where necessary. > $s =~ s/\n./\n/gs; > > diff --git a/scripts/clean-header-guards.pl b/scripts/clean-header-guards.pl > index f47d673ad5..a6680253b1 100755 > --- a/scripts/clean-header-guards.pl > +++ b/scripts/clean-header-guards.pl > @@ -19,7 +19,7 @@ > # Does the following: > # - Header files without a recognizable header guard are skipped. > # - Clean up any untidy header guards in-place. Warn if the cleanup > -# renames guard symbols, and explain how to find occurences of these > +# renames guard symbols, and explain how to find occurrences of these > # symbols that may have to be updated manually. > # - Warn about duplicate header guard symbols. To make full use of > # this warning, you should clean up *all* headers in one run. > diff --git a/scripts/decodetree.py b/scripts/decodetree.py > index c02de9865b..60fd3b5e5f 100644 > --- a/scripts/decodetree.py > +++ b/scripts/decodetree.py > @@ -94,7 +94,7 @@ def str_indent(c): > > > def str_fields(fields): > - """Return a string uniquely identifing FIELDS""" > + """Return a string uniquely identifying FIELDS""" > r = '' > for n in sorted(fields.keys()): > r += '_' + n > @@ -814,7 +814,7 @@ def parse_generic(lineno, parent_pat, name, toks): > arg = None > fmt = None > for t in toks: > - # '&Foo' gives a format an explcit argument set. > + # '&Foo' gives a format an explicit argument set. > if re.fullmatch(re_arg_ident, t): > tt = t[1:] > if arg: > @@ -903,7 +903,7 @@ def parse_generic(lineno, parent_pat, name, toks): > elif not (is_format and width == 0) and width != insnwidth: > error(lineno, 'definition has {0} bits'.format(width)) > > - # Do not check for fields overlaping fields; one valid usage > + # Do not check for fields overlapping fields; one valid usage > # is to be able to duplicate fields via import. > fieldmask = 0 > for f in flds.values(): > diff --git a/scripts/oss-fuzz/build.sh b/scripts/oss-fuzz/build.sh > index d16207eb67..0c3ca9e06f 100755 > --- a/scripts/oss-fuzz/build.sh > +++ b/scripts/oss-fuzz/build.sh > @@ -69,7 +69,7 @@ mkdir -p "$DEST_DIR/lib/" # Copy the shared libraries here > > if ! make "-j$(nproc)" qemu-fuzz-i386; then > fatal "Build failed. Please specify a compiler with fuzzing support"\ > - "using the \$CC and \$CXX environemnt variables"\ > + "using the \$CC and \$CXX environment variables"\ > "\nFor example: CC=clang CXX=clang++ $0" > fi > > diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.py > index 3ccfa1e116..3ee54be223 100644 > --- a/scripts/tracetool/__init__.py > +++ b/scripts/tracetool/__init__.py > @@ -34,7 +34,7 @@ def error(*lines): > def out(*lines, **kwargs): > """Write a set of output lines. > > - You can use kwargs as a shorthand for mapping variables when formating all > + You can use kwargs as a shorthand for mapping variables when formatting all > the strings in lines. > """ > lines = [ l % kwargs for l in lines ] > Applied to my trivial-patches branch. Thanks, Laurent
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index bd3faa154c..50910899f2 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -1870,7 +1870,7 @@ sub process { substr($s, 0, length($c), ''); # Make sure we remove the line prefixes as we have - # none on the first line, and are going to readd them + # none on the first line, and are going to re-add them # where necessary. $s =~ s/\n./\n/gs; diff --git a/scripts/clean-header-guards.pl b/scripts/clean-header-guards.pl index f47d673ad5..a6680253b1 100755 --- a/scripts/clean-header-guards.pl +++ b/scripts/clean-header-guards.pl @@ -19,7 +19,7 @@ # Does the following: # - Header files without a recognizable header guard are skipped. # - Clean up any untidy header guards in-place. Warn if the cleanup -# renames guard symbols, and explain how to find occurences of these +# renames guard symbols, and explain how to find occurrences of these # symbols that may have to be updated manually. # - Warn about duplicate header guard symbols. To make full use of # this warning, you should clean up *all* headers in one run. diff --git a/scripts/decodetree.py b/scripts/decodetree.py index c02de9865b..60fd3b5e5f 100644 --- a/scripts/decodetree.py +++ b/scripts/decodetree.py @@ -94,7 +94,7 @@ def str_indent(c): def str_fields(fields): - """Return a string uniquely identifing FIELDS""" + """Return a string uniquely identifying FIELDS""" r = '' for n in sorted(fields.keys()): r += '_' + n @@ -814,7 +814,7 @@ def parse_generic(lineno, parent_pat, name, toks): arg = None fmt = None for t in toks: - # '&Foo' gives a format an explcit argument set. + # '&Foo' gives a format an explicit argument set. if re.fullmatch(re_arg_ident, t): tt = t[1:] if arg: @@ -903,7 +903,7 @@ def parse_generic(lineno, parent_pat, name, toks): elif not (is_format and width == 0) and width != insnwidth: error(lineno, 'definition has {0} bits'.format(width)) - # Do not check for fields overlaping fields; one valid usage + # Do not check for fields overlapping fields; one valid usage # is to be able to duplicate fields via import. fieldmask = 0 for f in flds.values(): diff --git a/scripts/oss-fuzz/build.sh b/scripts/oss-fuzz/build.sh index d16207eb67..0c3ca9e06f 100755 --- a/scripts/oss-fuzz/build.sh +++ b/scripts/oss-fuzz/build.sh @@ -69,7 +69,7 @@ mkdir -p "$DEST_DIR/lib/" # Copy the shared libraries here if ! make "-j$(nproc)" qemu-fuzz-i386; then fatal "Build failed. Please specify a compiler with fuzzing support"\ - "using the \$CC and \$CXX environemnt variables"\ + "using the \$CC and \$CXX environment variables"\ "\nFor example: CC=clang CXX=clang++ $0" fi diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.py index 3ccfa1e116..3ee54be223 100644 --- a/scripts/tracetool/__init__.py +++ b/scripts/tracetool/__init__.py @@ -34,7 +34,7 @@ def error(*lines): def out(*lines, **kwargs): """Write a set of output lines. - You can use kwargs as a shorthand for mapping variables when formating all + You can use kwargs as a shorthand for mapping variables when formatting all the strings in lines. """ lines = [ l % kwargs for l in lines ]