diff mbox

[3/4] 9pfs: drop useless v9fs_string_null() function

Message ID 147394945935.684.4901814937936629234.stgit@bahia (mailing list archive)
State New, archived
Headers show

Commit Message

Greg Kurz Sept. 15, 2016, 2:24 p.m. UTC 
The v9fs_string_null() function just calls v9fs_string_free(). Also it
only has 4 users, whereas v9fs_string_free() has 87.

This patch converts users to call directly v9fs_string_free() and drops
the useless function.

Signed-off-by: Greg Kurz <groug@kaod.org>
---
 fsdev/9p-marshal.c |    5 -----
 fsdev/9p-marshal.h |    1 -
 hw/9pfs/9p.c       |    8 ++++----
 3 files changed, 4 insertions(+), 10 deletions(-)

Comments

Cédric Le Goater Sept. 15, 2016, 3:06 p.m. UTC | #1 
On 09/15/2016 04:24 PM, Greg Kurz wrote:
> The v9fs_string_null() function just calls v9fs_string_free(). Also it
> only has 4 users, whereas v9fs_string_free() has 87.
> 
> This patch converts users to call directly v9fs_string_free() and drops
> the useless function.

Reviewed-by: Cédric Le Goater <clg@kaod.org>

> Signed-off-by: Greg Kurz <groug@kaod.org>
> ---
>  fsdev/9p-marshal.c |    5 -----
>  fsdev/9p-marshal.h |    1 -
>  hw/9pfs/9p.c       |    8 ++++----
>  3 files changed, 4 insertions(+), 10 deletions(-)
> 
> diff --git a/fsdev/9p-marshal.c b/fsdev/9p-marshal.c
> index 238dbf21b1d5..a01bba6908a8 100644
> --- a/fsdev/9p-marshal.c
> +++ b/fsdev/9p-marshal.c
> @@ -23,15 +23,10 @@ void v9fs_string_free(V9fsString *str)
>      g_free(str->data);
>      str->data = NULL;
>      str->size = 0;
>  }
>  
> -void v9fs_string_null(V9fsString *str)
> -{
> -    v9fs_string_free(str);
> -}
> -
>  void GCC_FMT_ATTR(2, 3)
>  v9fs_string_sprintf(V9fsString *str, const char *fmt, ...)
>  {
>      va_list ap;
>  
> diff --git a/fsdev/9p-marshal.h b/fsdev/9p-marshal.h
> index 140db6d99f9c..77f7fef326ee 100644
> --- a/fsdev/9p-marshal.h
> +++ b/fsdev/9p-marshal.h
> @@ -75,10 +75,9 @@ static inline void v9fs_string_init(V9fsString *str)
>  {
>      str->data = NULL;
>      str->size = 0;
>  }
>  extern void v9fs_string_free(V9fsString *str);
> -extern void v9fs_string_null(V9fsString *str);
>  extern void v9fs_string_sprintf(V9fsString *str, const char *fmt, ...);
>  extern void v9fs_string_copy(V9fsString *lhs, V9fsString *rhs);
>  
>  #endif
> diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
> index dfe293d11d1c..d8f48ca76c47 100644
> --- a/hw/9pfs/9p.c
> +++ b/hw/9pfs/9p.c
> @@ -808,19 +808,19 @@ static int stat_to_v9stat(V9fsPDU *pdu, V9fsPath *name,
>      v9stat->mode = stat_to_v9mode(stbuf);
>      v9stat->atime = stbuf->st_atime;
>      v9stat->mtime = stbuf->st_mtime;
>      v9stat->length = stbuf->st_size;
>  
> -    v9fs_string_null(&v9stat->uid);
> -    v9fs_string_null(&v9stat->gid);
> -    v9fs_string_null(&v9stat->muid);
> +    v9fs_string_free(&v9stat->uid);
> +    v9fs_string_free(&v9stat->gid);
> +    v9fs_string_free(&v9stat->muid);
>  
>      v9stat->n_uid = stbuf->st_uid;
>      v9stat->n_gid = stbuf->st_gid;
>      v9stat->n_muid = 0;
>  
> -    v9fs_string_null(&v9stat->extension);
> +    v9fs_string_free(&v9stat->extension);
>  
>      if (v9stat->mode & P9_STAT_MODE_SYMLINK) {
>          err = v9fs_co_readlink(pdu, name, &v9stat->extension);
>          if (err < 0) {
>              return err;
> 
>
diff mbox

Patch

diff --git a/fsdev/9p-marshal.c b/fsdev/9p-marshal.c
index 238dbf21b1d5..a01bba6908a8 100644
--- a/fsdev/9p-marshal.c
+++ b/fsdev/9p-marshal.c
@@ -23,15 +23,10 @@  void v9fs_string_free(V9fsString *str)
     g_free(str->data);
     str->data = NULL;
     str->size = 0;
 }
 
-void v9fs_string_null(V9fsString *str)
-{
-    v9fs_string_free(str);
-}
-
 void GCC_FMT_ATTR(2, 3)
 v9fs_string_sprintf(V9fsString *str, const char *fmt, ...)
 {
     va_list ap;
 
diff --git a/fsdev/9p-marshal.h b/fsdev/9p-marshal.h
index 140db6d99f9c..77f7fef326ee 100644
--- a/fsdev/9p-marshal.h
+++ b/fsdev/9p-marshal.h
@@ -75,10 +75,9 @@  static inline void v9fs_string_init(V9fsString *str)
 {
     str->data = NULL;
     str->size = 0;
 }
 extern void v9fs_string_free(V9fsString *str);
-extern void v9fs_string_null(V9fsString *str);
 extern void v9fs_string_sprintf(V9fsString *str, const char *fmt, ...);
 extern void v9fs_string_copy(V9fsString *lhs, V9fsString *rhs);
 
 #endif
diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
index dfe293d11d1c..d8f48ca76c47 100644
--- a/hw/9pfs/9p.c
+++ b/hw/9pfs/9p.c
@@ -808,19 +808,19 @@  static int stat_to_v9stat(V9fsPDU *pdu, V9fsPath *name,
     v9stat->mode = stat_to_v9mode(stbuf);
     v9stat->atime = stbuf->st_atime;
     v9stat->mtime = stbuf->st_mtime;
     v9stat->length = stbuf->st_size;
 
-    v9fs_string_null(&v9stat->uid);
-    v9fs_string_null(&v9stat->gid);
-    v9fs_string_null(&v9stat->muid);
+    v9fs_string_free(&v9stat->uid);
+    v9fs_string_free(&v9stat->gid);
+    v9fs_string_free(&v9stat->muid);
 
     v9stat->n_uid = stbuf->st_uid;
     v9stat->n_gid = stbuf->st_gid;
     v9stat->n_muid = 0;
 
-    v9fs_string_null(&v9stat->extension);
+    v9fs_string_free(&v9stat->extension);
 
     if (v9stat->mode & P9_STAT_MODE_SYMLINK) {
         err = v9fs_co_readlink(pdu, name, &v9stat->extension);
         if (err < 0) {
             return err;