[PATCH] fsdev: open brace '{' following struct go on the same line

zhouyang posted 1 patch 3 years, 4 months ago
Test checkpatch passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20201209060735.2760943-1-zhouyang789@huawei.com
Maintainers: Greg Kurz <groug@kaod.org>, Christian Schoenebeck <qemu_oss@crudebyte.com>
fsdev/9p-marshal.h | 12 ++++--------
fsdev/file-op-9p.h |  3 +--
2 files changed, 5 insertions(+), 10 deletions(-)
[PATCH] fsdev: open brace '{' following struct go on the same line
Posted by zhouyang 3 years, 4 months ago
I found some style problems while check the code using checkpatch.pl.
This commit fixs the issue below:
ERROR: open brace '{' following struct go on the same line

Signed-off-by: zhouyang <zhouyang789@huawei.com>
---
 fsdev/9p-marshal.h | 12 ++++--------
 fsdev/file-op-9p.h |  3 +--
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/fsdev/9p-marshal.h b/fsdev/9p-marshal.h
index 8f3babb60a..ceaf2f521e 100644
--- a/fsdev/9p-marshal.h
+++ b/fsdev/9p-marshal.h
@@ -1,21 +1,18 @@
 #ifndef QEMU_9P_MARSHAL_H
 #define QEMU_9P_MARSHAL_H
 
-typedef struct V9fsString
-{
+typedef struct V9fsString {
     uint16_t size;
     char *data;
 } V9fsString;
 
-typedef struct V9fsQID
-{
+typedef struct V9fsQID {
     uint8_t type;
     uint32_t version;
     uint64_t path;
 } V9fsQID;
 
-typedef struct V9fsStat
-{
+typedef struct V9fsStat {
     int16_t size;
     int16_t type;
     int32_t dev;
@@ -35,8 +32,7 @@ typedef struct V9fsStat
     int32_t n_muid;
 } V9fsStat;
 
-typedef struct V9fsIattr
-{
+typedef struct V9fsIattr {
     int32_t valid;
     int32_t mode;
     int32_t uid;
diff --git a/fsdev/file-op-9p.h b/fsdev/file-op-9p.h
index d51cec2f3b..42f677cf38 100644
--- a/fsdev/file-op-9p.h
+++ b/fsdev/file-op-9p.h
@@ -110,8 +110,7 @@ typedef union V9fsFidOpenState V9fsFidOpenState;
 
 void cred_init(FsCred *);
 
-struct FileOperations
-{
+struct FileOperations {
     int (*parse_opts)(QemuOpts *, FsDriverEntry *, Error **errp);
     int (*init)(FsContext *, Error **errp);
     void (*cleanup)(FsContext *);
-- 
2.23.0


Re: [PATCH] fsdev: open brace '{' following struct go on the same line
Posted by Laurent Vivier 3 years, 4 months ago
Le 09/12/2020 à 07:07, zhouyang a écrit :
> I found some style problems while check the code using checkpatch.pl.
> This commit fixs the issue below:
> ERROR: open brace '{' following struct go on the same line
> 
> Signed-off-by: zhouyang <zhouyang789@huawei.com>
> ---
>  fsdev/9p-marshal.h | 12 ++++--------
>  fsdev/file-op-9p.h |  3 +--
>  2 files changed, 5 insertions(+), 10 deletions(-)
> 
> diff --git a/fsdev/9p-marshal.h b/fsdev/9p-marshal.h
> index 8f3babb60a..ceaf2f521e 100644
> --- a/fsdev/9p-marshal.h
> +++ b/fsdev/9p-marshal.h
> @@ -1,21 +1,18 @@
>  #ifndef QEMU_9P_MARSHAL_H
>  #define QEMU_9P_MARSHAL_H
>  
> -typedef struct V9fsString
> -{
> +typedef struct V9fsString {
>      uint16_t size;
>      char *data;
>  } V9fsString;
>  
> -typedef struct V9fsQID
> -{
> +typedef struct V9fsQID {
>      uint8_t type;
>      uint32_t version;
>      uint64_t path;
>  } V9fsQID;
>  
> -typedef struct V9fsStat
> -{
> +typedef struct V9fsStat {
>      int16_t size;
>      int16_t type;
>      int32_t dev;
> @@ -35,8 +32,7 @@ typedef struct V9fsStat
>      int32_t n_muid;
>  } V9fsStat;
>  
> -typedef struct V9fsIattr
> -{
> +typedef struct V9fsIattr {
>      int32_t valid;
>      int32_t mode;
>      int32_t uid;
> diff --git a/fsdev/file-op-9p.h b/fsdev/file-op-9p.h
> index d51cec2f3b..42f677cf38 100644
> --- a/fsdev/file-op-9p.h
> +++ b/fsdev/file-op-9p.h
> @@ -110,8 +110,7 @@ typedef union V9fsFidOpenState V9fsFidOpenState;
>  
>  void cred_init(FsCred *);
>  
> -struct FileOperations
> -{
> +struct FileOperations {
>      int (*parse_opts)(QemuOpts *, FsDriverEntry *, Error **errp);
>      int (*init)(FsContext *, Error **errp);
>      void (*cleanup)(FsContext *);
> 

Applied to my trivial-patches branch.

Thanks,
Laurent


Re: [PATCH] fsdev: open brace '{' following struct go on the same line
Posted by Philippe Mathieu-Daudé 3 years, 4 months ago
On 12/9/20 7:07 AM, zhouyang wrote:
> I found some style problems while check the code using checkpatch.pl.
> This commit fixs the issue below:
> ERROR: open brace '{' following struct go on the same line
> 
> Signed-off-by: zhouyang <zhouyang789@huawei.com>
> ---
>  fsdev/9p-marshal.h | 12 ++++--------
>  fsdev/file-op-9p.h |  3 +--
>  2 files changed, 5 insertions(+), 10 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>