| Message ID | 20200426025456.2739535-1-mrjoel@lixil.net |
|---|---|
| State | Accepted |
| Commit | b40745e5c29a45ebe7efce53a1e3ba751d0ef351 |
| Headers | show |
| Series | [v3] cmd: mvebu: bubt: fix quoted string split across lines | expand |
Ping for review feedback on this patch, it'd be good to have the fix included in the same release as the merge was included. Joel On 2020-04-25 20:54, Joel Johnson wrote: > Update quoted string alignment to address checkpatch.pl warning > originally introduced in > commit f60a66ef5d7d ("cmd: mvebu: bubt: show image boot device"). > > Signed-off-by: Joel Johnson <mrjoel at lixil.net> > > --- > > > I am sort of inferring that this is the desired fix, preferring line > length infractions over split quoted strings. As such, I've combined > the > static part of the string for grepping and left the dynamic parts on > the > next line. > > v2 change: > - syntax fix > v3 change: > - actually add syntax fix... > > --- > cmd/mvebu/bubt.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/cmd/mvebu/bubt.c b/cmd/mvebu/bubt.c > index dc0ce01c35..ef53153c46 100644 > --- a/cmd/mvebu/bubt.c > +++ b/cmd/mvebu/bubt.c > @@ -730,8 +730,8 @@ static int bubt_check_boot_mode(const struct > bubt_dev *dst) > > for (int i = 0; i < ARRAY_SIZE(a38x_boot_modes); i++) { > if (a38x_boot_modes[i].id == hdr->blockid) { > - printf("Error: A38x image meant to be " > - "booted from \"%s\", not \"%s\"!\n", > + printf("Error: A38x image meant to be booted from " > + "\"%s\", not \"%s\"!\n", > a38x_boot_modes[i].name, dst->name); > return -ENOEXEC; > }
On Sat, 25 Apr 2020 at 20:55, Joel Johnson <mrjoel at lixil.net> wrote: > > Update quoted string alignment to address checkpatch.pl warning > originally introduced in > commit f60a66ef5d7d ("cmd: mvebu: bubt: show image boot device"). > > Signed-off-by: Joel Johnson <mrjoel at lixil.net> > > --- > > > I am sort of inferring that this is the desired fix, preferring line > length infractions over split quoted strings. As such, I've combined the > static part of the string for grepping and left the dynamic parts on the > next line. > > v2 change: > - syntax fix > v3 change: > - actually add syntax fix... > > --- > cmd/mvebu/bubt.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > Reviewed-by: Simon Glass <sjg at chromium.org>
Hi Joel, On 01.05.20 23:41, Joel Johnson wrote: > Ping for review feedback on this patch, it'd be good to have the fix > included in the same release as the merge was included. I'll send the pull request later today. Thanks, Stefan > Joel > > On 2020-04-25 20:54, Joel Johnson wrote: >> Update quoted string alignment to address checkpatch.pl warning >> originally introduced in >> commit f60a66ef5d7d ("cmd: mvebu: bubt: show image boot device"). >> >> Signed-off-by: Joel Johnson <mrjoel at lixil.net> >> >> --- >> >> >> I am sort of inferring that this is the desired fix, preferring line >> length infractions over split quoted strings. As such, I've combined the >> static part of the string for grepping and left the dynamic parts on the >> next line. >> >> v2 change: >> ? - syntax fix >> v3 change: >> ? - actually add syntax fix... >> >> --- >> ?cmd/mvebu/bubt.c | 4 ++-- >> ?1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/cmd/mvebu/bubt.c b/cmd/mvebu/bubt.c >> index dc0ce01c35..ef53153c46 100644 >> --- a/cmd/mvebu/bubt.c >> +++ b/cmd/mvebu/bubt.c >> @@ -730,8 +730,8 @@ static int bubt_check_boot_mode(const struct >> bubt_dev *dst) >> >> ???????? for (int i = 0; i < ARRAY_SIZE(a38x_boot_modes); i++) { >> ???????????? if (a38x_boot_modes[i].id == hdr->blockid) { >> -??????????????? printf("Error: A38x image meant to be " >> -?????????????????????? "booted from \"%s\", not \"%s\"!\n", >> +??????????????? printf("Error: A38x image meant to be booted from " >> +?????????????????????? "\"%s\", not \"%s\"!\n", >> ??????????????????????? a38x_boot_modes[i].name, dst->name); >> ???????????????? return -ENOEXEC; >> ???????????? } Viele Gr??e, Stefan
diff --git a/cmd/mvebu/bubt.c b/cmd/mvebu/bubt.c index dc0ce01c35..ef53153c46 100644 --- a/cmd/mvebu/bubt.c +++ b/cmd/mvebu/bubt.c @@ -730,8 +730,8 @@ static int bubt_check_boot_mode(const struct bubt_dev *dst) for (int i = 0; i < ARRAY_SIZE(a38x_boot_modes); i++) { if (a38x_boot_modes[i].id == hdr->blockid) { - printf("Error: A38x image meant to be " - "booted from \"%s\", not \"%s\"!\n", + printf("Error: A38x image meant to be booted from " + "\"%s\", not \"%s\"!\n", a38x_boot_modes[i].name, dst->name); return -ENOEXEC; }
Update quoted string alignment to address checkpatch.pl warning originally introduced in commit f60a66ef5d7d ("cmd: mvebu: bubt: show image boot device"). Signed-off-by: Joel Johnson <mrjoel at lixil.net> --- I am sort of inferring that this is the desired fix, preferring line length infractions over split quoted strings. As such, I've combined the static part of the string for grepping and left the dynamic parts on the next line. v2 change: - syntax fix v3 change: - actually add syntax fix... --- cmd/mvebu/bubt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)