RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-11 02:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

mount.ceph: fix warnings, add to Makefile.am

Browse Source
This commit is contained in:
Sage Weil 2008-12-23 12:09:13 -08:00
parent 701ae00462
commit ff2ac52582
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Makefile.am
View File

@ -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

6
src/mount.ceph.c
View File

@ -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);
}