From a1b0744772b1d56cb4f043bb4cbd8006b63108ed Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Sat, 27 Apr 2013 22:36:42 -0700 Subject: [PATCH] hammer2 - Fix compiler warnings * Fix compiler warnings --- sbin/hammer2/cmd_remote.c | 4 ++-- sbin/hammer2/main.c | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/sbin/hammer2/cmd_remote.c b/sbin/hammer2/cmd_remote.c index 499b9e9083..e6417984f0 100644 --- a/sbin/hammer2/cmd_remote.c +++ b/sbin/hammer2/cmd_remote.c @@ -58,7 +58,7 @@ cmd_remote_connect(const char *sel_path, const char *url) ecode = 1; } close(fd); - return 0; + return ecode; } int @@ -84,7 +84,7 @@ cmd_remote_disconnect(const char *sel_path, const char *url) ecode = 1; } close(fd); - return 0; + return ecode; } int diff --git a/sbin/hammer2/main.c b/sbin/hammer2/main.c index e97a5b9039..da0318480d 100644 --- a/sbin/hammer2/main.c +++ b/sbin/hammer2/main.c @@ -220,7 +220,7 @@ main(int ac, char **av) */ ecode = cmd_service(); } else if (strcmp(av[0], "stat") == 0) { - ecode = cmd_stat(ac - 1, (const char **)&av[1]); + ecode = cmd_stat(ac - 1, (const char **)(void *)&av[1]); } else if (strcmp(av[0], "leaf") == 0) { /* * Start the management daemon for a specific PFS. @@ -275,7 +275,8 @@ main(int ac, char **av) const char *rsapath = HAMMER2_DEFAULT_DIR "/rsa.pub"; ecode = cmd_rsaenc(&rsapath, 1); } else { - ecode = cmd_rsaenc((const char **)&av[1], ac - 1); + ecode = cmd_rsaenc((const char **)(void *)&av[1], + ac - 1); } } else if (strcmp(av[0], "rsadec") == 0) { /* @@ -294,7 +295,8 @@ main(int ac, char **av) const char *rsapath = HAMMER2_DEFAULT_DIR "/rsa.prv"; ecode = cmd_rsadec(&rsapath, 1); } else { - ecode = cmd_rsadec((const char **)&av[1], ac - 1); + ecode = cmd_rsadec((const char **)(void *)&av[1], + ac - 1); } } else if (strcmp(av[0], "show") == 0) { /* -- 2.41.0