All functions which deal with v9fs_request() use `retval' variable to hold result of the request (except some which use this value for other purposes too), but 3 use different name (ret or err). Rename these 3 for consistency. There's no actual code changes.
Signed-off-by: Michael Tokarev <m...@tls.msk.ru> --- hw/9pfs/virtio-9p-proxy.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/hw/9pfs/virtio-9p-proxy.c b/hw/9pfs/virtio-9p-proxy.c index 59c7650..c7b2f16 100644 --- a/hw/9pfs/virtio-9p-proxy.c +++ b/hw/9pfs/virtio-9p-proxy.c @@ -903,7 +903,7 @@ static int proxy_renameat(FsContext *ctx, V9fsPath *olddir, const char *old_name, V9fsPath *newdir, const char *new_name) { - int ret; + int retval; V9fsString old_full_name, new_full_name; v9fs_string_init(&old_full_name); @@ -912,30 +912,30 @@ static int proxy_renameat(FsContext *ctx, V9fsPath *olddir, v9fs_string_sprintf(&old_full_name, "%s/%s", olddir->data, old_name); v9fs_string_sprintf(&new_full_name, "%s/%s", newdir->data, new_name); - ret = proxy_rename(ctx, old_full_name.data, new_full_name.data); + retval = proxy_rename(ctx, old_full_name.data, new_full_name.data); v9fs_string_free(&old_full_name); v9fs_string_free(&new_full_name); - return ret; + return retval; } static int proxy_unlinkat(FsContext *ctx, V9fsPath *dir, const char *name, int flags) { - int ret; + int retval; V9fsString fullname; v9fs_string_init(&fullname); v9fs_string_sprintf(&fullname, "%s/%s", dir->data, name); - ret = proxy_remove(ctx, fullname.data); + retval = proxy_remove(ctx, fullname.data); v9fs_string_free(&fullname); - return ret; + return retval; } static int proxy_ioc_getversion(FsContext *fs_ctx, V9fsPath *path, mode_t st_mode, uint64_t *st_gen) { - int err; + int retval; /* Do not try to open special files like device nodes, fifos etc * we can get fd for regular files and directories only @@ -944,8 +944,8 @@ static int proxy_ioc_getversion(FsContext *fs_ctx, V9fsPath *path, errno = ENOTTY; return -1; } - err = v9fs_request(fs_ctx->private, T_GETVERSION, st_gen, "s", path); - return err; + retval = v9fs_request(fs_ctx->private, T_GETVERSION, st_gen, "s", path); + return retval; } static int connect_namedsocket(const char *path) -- 2.1.4