From ff2ac5258258cd51f33176ebfcc8b50c717eff31 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 23 Dec 2008 12:09:13 -0800 Subject: [PATCH] mount.ceph: fix warnings, add to Makefile.am --- src/Makefile.am | 5 ++++- src/mount.ceph.c | 6 ------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 60b71e1cbaad2..1b2acccede17e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -20,6 +20,8 @@ crushtool_LDADD = libcommon.a libcrush.a osdmaptool_SOURCES = osdmaptool.cc osdmaptool_LDADD = libcommon.a libcrush.a +mount_ceph_SOURCES = mount.ceph.c + # mds cmds_SOURCES = cmds.cc msg/SimpleMessenger.cc cmds_LDADD = libcommon.a libmds.a libosdc.a libcrush.a libcommon.a @@ -43,7 +45,8 @@ bin_PROGRAMS = \ cmon cmds cosd csyn \ ceph \ mkmonfs monmaptool osdmaptool crushtool \ - streamtest dupstore dumpjournal testmsgr + streamtest dupstore dumpjournal testmsgr \ + mount.ceph bin_SCRIPTS = crun diff --git a/src/mount.ceph.c b/src/mount.ceph.c index 4887186ff58f6..e0ebb75df39aa 100644 --- a/src/mount.ceph.c +++ b/src/mount.ceph.c @@ -34,7 +34,6 @@ char *mount_resolve_dest(char *orig_str) char *mount_path; char *tok, *p, *port_str; int len, pos; - int rc; mount_path = strrchr(orig_str, ':'); if (!mount_path) { @@ -63,7 +62,6 @@ char *mount_resolve_dest(char *orig_str) tok = strtok(orig_str, ","); while (tok) { - int i; struct hostent *ent; char addr[16]; @@ -112,13 +110,11 @@ char *mount_resolve_dest(char *orig_str) static int parse_options(char ** optionsp, int * filesys_flags) { const char * data; - char * percent_char = NULL; char * value = NULL; char * next_keyword = NULL; char * out = NULL; int out_len = 0; int word_len; - int rc = 0; int skip; int pos = 0; @@ -192,7 +188,6 @@ static int parse_options(char ** optionsp, int * filesys_flags) } } -nocopy: data = next_keyword; } @@ -240,7 +235,6 @@ int main(int argc, char *argv[]) } } -out: free(new_argv); exit(0); } -- 2.39.5