Re: [PATCH V4 4/4] bsd-user: space required after semicolon

[shiliyang]

Hi Warner:
   I might misunderstood it before.
   So, what should I do is to make a new pull request for bsd-user-rebase-3.1 
branch. Am I right?
   I have submitted a pull request: 
https://github.com/qemu-bsd-user/qemu-bsd-user/pull/4
   Please review it.

Thanks.
Best regards.

On 2021/1/18 10:35, Warner Losh wrote:
> Can you submit this to our current fork at http://github.com/qemu-bsd-user 
> <http://github.com/qemu-bsd-user> on the rebase-3.1 branch? Having churn like 
> this upstream just slows us down since we have extensive changes and these 
> will conflict.
> 
> Warner 
> 
> On Sun, Jan 17, 2021, 7:21 PM shiliyang <shiliyang@huawei.com 
> <mailto:shiliyang@huawei.com>> wrote:
> 
>     This patch fixes error style problems found by checkpatch.pl 
> <http://checkpatch.pl>:
>     ERROR: space required after that ','
> 
>     Signed-off-by: Liyang Shi <shiliyang@huawei.com 
> <mailto:shiliyang@huawei.com>>
>     ---
>      bsd-user/elfload.c | 10 +++++-----
>      1 file changed, 5 insertions(+), 5 deletions(-)
> 
>     diff --git a/bsd-user/elfload.c b/bsd-user/elfload.c
>     index 2842dfe56b..c89c998c22 100644
>     --- a/bsd-user/elfload.c
>     +++ b/bsd-user/elfload.c
>     @@ -636,8 +636,8 @@ int load_elf_binary(struct bsd_binprm *bprm, struct 
> target_pt_regs *regs,
> 
>      #ifndef __FreeBSD__
>          bprm->p = copy_elf_strings(1, &bprm->filename, bprm->page, bprm->p);
>     -    bprm->p = copy_elf_strings(bprm->envc,bprm->envp,bprm->page,bprm->p);
>     -    bprm->p = copy_elf_strings(bprm->argc,bprm->argv,bprm->page,bprm->p);
>     +    bprm->p = copy_elf_strings(bprm->envc, bprm->envp, bprm->page, 
> bprm->p);
>     +    bprm->p = copy_elf_strings(bprm->argc, bprm->argv, bprm->page, 
> bprm->p);
>          if (!bprm->p) {
>              retval = -E2BIG;
>          }
>     @@ -739,7 +739,7 @@ int load_elf_binary(struct bsd_binprm *bprm, struct 
> target_pt_regs *regs,
>                  if (retval >= 0) {
>                      retval = lseek(interpreter_fd, 0, SEEK_SET);
>                      if(retval >= 0) {
>     -                    retval = read(interpreter_fd,bprm->buf,128);
>     +                    retval = read(interpreter_fd, bprm->buf, 128);
>                      }
>                  }
>                  if (retval >= 0) {
>     @@ -769,7 +769,7 @@ int load_elf_binary(struct bsd_binprm *bprm, struct 
> target_pt_regs *regs,
>              }
> 
>              if (interp_elf_ex.e_ident[0] != 0x7f ||
>     -                strncmp((char *)&interp_elf_ex.e_ident[1], "ELF",3) != 
> 0) {
>     +                strncmp((char *)&interp_elf_ex.e_ident[1], "ELF", 3) != 
> 0) {
>                  interpreter_type &= ~INTERPRETER_ELF;
>              }
> 
>     @@ -792,7 +792,7 @@ int load_elf_binary(struct bsd_binprm *bprm, struct 
> target_pt_regs *regs,
>                  passed_p = passed_fileno;
> 
>                  if (elf_interpreter) {
>     -                bprm->p = 
> copy_elf_strings(1,&passed_p,bprm->page,bprm->p);
>     +                bprm->p = copy_elf_strings(1, &passed_p, bprm->page, 
> bprm->p);
>                      bprm->argc++;
>                  }
>              }
>     -- 
>     2.29.1.59.gf9b6481aed
>