diff mbox

[2/7] 9pfs: Fix warnings from Sparse

Message ID 1425838674-28393-1-git-send-email-sw@weilnetz.de
State Accepted
Headers show

Commit Message

Stefan Weil March 8, 2015, 6:17 p.m. UTC
Sparse report:

9pfs/virtio-9p.c:1953:9: warning: returning void-valued expression
9pfs/virtio-9p-handle.c:143:5: warning: returning void-valued expression
9pfs/virtio-9p-handle.c:160:5: warning: returning void-valued expression
9pfs/virtio-9p-local.c:384:5: warning: returning void-valued expression
9pfs/virtio-9p-local.c:415:5: warning: returning void-valued expression
9pfs/virtio-9p-proxy.c:672:5: warning: returning void-valued expression
9pfs/virtio-9p-proxy.c:689:5: warning: returning void-valued expression

Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 hw/9pfs/virtio-9p-handle.c | 4 ++--
 hw/9pfs/virtio-9p-local.c  | 4 ++--
 hw/9pfs/virtio-9p-proxy.c  | 4 ++--
 hw/9pfs/virtio-9p.c        | 3 ++-
 4 files changed, 8 insertions(+), 7 deletions(-)

Comments

Aneesh Kumar K.V March 10, 2015, 5:42 p.m. UTC | #1
Stefan Weil <sw@weilnetz.de> writes:

> Sparse report:
>
> 9pfs/virtio-9p.c:1953:9: warning: returning void-valued expression
> 9pfs/virtio-9p-handle.c:143:5: warning: returning void-valued expression
> 9pfs/virtio-9p-handle.c:160:5: warning: returning void-valued expression
> 9pfs/virtio-9p-local.c:384:5: warning: returning void-valued expression
> 9pfs/virtio-9p-local.c:415:5: warning: returning void-valued expression
> 9pfs/virtio-9p-proxy.c:672:5: warning: returning void-valued expression
> 9pfs/virtio-9p-proxy.c:689:5: warning: returning void-valued expression
>
> Cc: Michael S. Tsirkin <mst@redhat.com>
> Cc: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
> Signed-off-by: Stefan Weil <sw@weilnetz.de>

Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>

> ---
>  hw/9pfs/virtio-9p-handle.c | 4 ++--
>  hw/9pfs/virtio-9p-local.c  | 4 ++--
>  hw/9pfs/virtio-9p-proxy.c  | 4 ++--
>  hw/9pfs/virtio-9p.c        | 3 ++-
>  4 files changed, 8 insertions(+), 7 deletions(-)
>
> diff --git a/hw/9pfs/virtio-9p-handle.c b/hw/9pfs/virtio-9p-handle.c
> index 4b79cef..13eabb9 100644
> --- a/hw/9pfs/virtio-9p-handle.c
> +++ b/hw/9pfs/virtio-9p-handle.c
> @@ -140,7 +140,7 @@ static int handle_opendir(FsContext *ctx,
>  
>  static void handle_rewinddir(FsContext *ctx, V9fsFidOpenState *fs)
>  {
> -    return rewinddir(fs->dir);
> +    rewinddir(fs->dir);
>  }
>  
>  static off_t handle_telldir(FsContext *ctx, V9fsFidOpenState *fs)
> @@ -157,7 +157,7 @@ static int handle_readdir_r(FsContext *ctx, V9fsFidOpenState *fs,
>  
>  static void handle_seekdir(FsContext *ctx, V9fsFidOpenState *fs, off_t off)
>  {
> -    return seekdir(fs->dir, off);
> +    seekdir(fs->dir, off);
>  }
>  
>  static ssize_t handle_preadv(FsContext *ctx, V9fsFidOpenState *fs,
> diff --git a/hw/9pfs/virtio-9p-local.c b/hw/9pfs/virtio-9p-local.c
> index a183eee..fec580b 100644
> --- a/hw/9pfs/virtio-9p-local.c
> +++ b/hw/9pfs/virtio-9p-local.c
> @@ -381,7 +381,7 @@ static int local_opendir(FsContext *ctx,
>  
>  static void local_rewinddir(FsContext *ctx, V9fsFidOpenState *fs)
>  {
> -    return rewinddir(fs->dir);
> +    rewinddir(fs->dir);
>  }
>  
>  static off_t local_telldir(FsContext *ctx, V9fsFidOpenState *fs)
> @@ -412,7 +412,7 @@ again:
>  
>  static void local_seekdir(FsContext *ctx, V9fsFidOpenState *fs, off_t off)
>  {
> -    return seekdir(fs->dir, off);
> +    seekdir(fs->dir, off);
>  }
>  
>  static ssize_t local_preadv(FsContext *ctx, V9fsFidOpenState *fs,
> diff --git a/hw/9pfs/virtio-9p-proxy.c b/hw/9pfs/virtio-9p-proxy.c
> index 59c7445..edab402 100644
> --- a/hw/9pfs/virtio-9p-proxy.c
> +++ b/hw/9pfs/virtio-9p-proxy.c
> @@ -669,7 +669,7 @@ static int proxy_opendir(FsContext *ctx,
>  
>  static void proxy_rewinddir(FsContext *ctx, V9fsFidOpenState *fs)
>  {
> -    return rewinddir(fs->dir);
> +    rewinddir(fs->dir);
>  }
>  
>  static off_t proxy_telldir(FsContext *ctx, V9fsFidOpenState *fs)
> @@ -686,7 +686,7 @@ static int proxy_readdir_r(FsContext *ctx, V9fsFidOpenState *fs,
>  
>  static void proxy_seekdir(FsContext *ctx, V9fsFidOpenState *fs, off_t off)
>  {
> -    return seekdir(fs->dir, off);
> +    seekdir(fs->dir, off);
>  }
>  
>  static ssize_t proxy_preadv(FsContext *ctx, V9fsFidOpenState *fs,
> diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c
> index 5861a5b..4964da0 100644
> --- a/hw/9pfs/virtio-9p.c
> +++ b/hw/9pfs/virtio-9p.c
> @@ -1950,7 +1950,8 @@ static void v9fs_write(void *opaque)
>  
>      err = pdu_unmarshal(pdu, offset, "dqd", &fid, &off, &count);
>      if (err < 0) {
> -        return complete_pdu(s, pdu, err);
> +        complete_pdu(s, pdu, err);
> +        return;
>      }
>      offset += err;
>      v9fs_init_qiov_from_pdu(&qiov_full, pdu, offset, count, true);
> -- 
> 2.1.4
diff mbox

Patch

diff --git a/hw/9pfs/virtio-9p-handle.c b/hw/9pfs/virtio-9p-handle.c
index 4b79cef..13eabb9 100644
--- a/hw/9pfs/virtio-9p-handle.c
+++ b/hw/9pfs/virtio-9p-handle.c
@@ -140,7 +140,7 @@  static int handle_opendir(FsContext *ctx,
 
 static void handle_rewinddir(FsContext *ctx, V9fsFidOpenState *fs)
 {
-    return rewinddir(fs->dir);
+    rewinddir(fs->dir);
 }
 
 static off_t handle_telldir(FsContext *ctx, V9fsFidOpenState *fs)
@@ -157,7 +157,7 @@  static int handle_readdir_r(FsContext *ctx, V9fsFidOpenState *fs,
 
 static void handle_seekdir(FsContext *ctx, V9fsFidOpenState *fs, off_t off)
 {
-    return seekdir(fs->dir, off);
+    seekdir(fs->dir, off);
 }
 
 static ssize_t handle_preadv(FsContext *ctx, V9fsFidOpenState *fs,
diff --git a/hw/9pfs/virtio-9p-local.c b/hw/9pfs/virtio-9p-local.c
index a183eee..fec580b 100644
--- a/hw/9pfs/virtio-9p-local.c
+++ b/hw/9pfs/virtio-9p-local.c
@@ -381,7 +381,7 @@  static int local_opendir(FsContext *ctx,
 
 static void local_rewinddir(FsContext *ctx, V9fsFidOpenState *fs)
 {
-    return rewinddir(fs->dir);
+    rewinddir(fs->dir);
 }
 
 static off_t local_telldir(FsContext *ctx, V9fsFidOpenState *fs)
@@ -412,7 +412,7 @@  again:
 
 static void local_seekdir(FsContext *ctx, V9fsFidOpenState *fs, off_t off)
 {
-    return seekdir(fs->dir, off);
+    seekdir(fs->dir, off);
 }
 
 static ssize_t local_preadv(FsContext *ctx, V9fsFidOpenState *fs,
diff --git a/hw/9pfs/virtio-9p-proxy.c b/hw/9pfs/virtio-9p-proxy.c
index 59c7445..edab402 100644
--- a/hw/9pfs/virtio-9p-proxy.c
+++ b/hw/9pfs/virtio-9p-proxy.c
@@ -669,7 +669,7 @@  static int proxy_opendir(FsContext *ctx,
 
 static void proxy_rewinddir(FsContext *ctx, V9fsFidOpenState *fs)
 {
-    return rewinddir(fs->dir);
+    rewinddir(fs->dir);
 }
 
 static off_t proxy_telldir(FsContext *ctx, V9fsFidOpenState *fs)
@@ -686,7 +686,7 @@  static int proxy_readdir_r(FsContext *ctx, V9fsFidOpenState *fs,
 
 static void proxy_seekdir(FsContext *ctx, V9fsFidOpenState *fs, off_t off)
 {
-    return seekdir(fs->dir, off);
+    seekdir(fs->dir, off);
 }
 
 static ssize_t proxy_preadv(FsContext *ctx, V9fsFidOpenState *fs,
diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c
index 5861a5b..4964da0 100644
--- a/hw/9pfs/virtio-9p.c
+++ b/hw/9pfs/virtio-9p.c
@@ -1950,7 +1950,8 @@  static void v9fs_write(void *opaque)
 
     err = pdu_unmarshal(pdu, offset, "dqd", &fid, &off, &count);
     if (err < 0) {
-        return complete_pdu(s, pdu, err);
+        complete_pdu(s, pdu, err);
+        return;
     }
     offset += err;
     v9fs_init_qiov_from_pdu(&qiov_full, pdu, offset, count, true);