repositories
/
deb_libnfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #44 from plieven/master
[deb_libnfs.git]
/
lib
/
libnfs.c
diff --git
a/lib/libnfs.c
b/lib/libnfs.c
index c183a460a3fb0e9f40f0443339ec0d607f099d9e..029c9c94d1f82795a5104e456caec30fdbbc4e3e 100644
(file)
--- a/
lib/libnfs.c
+++ b/
lib/libnfs.c
@@
-201,6
+201,7
@@
static struct nfs_url *nfs_parse_url(struct nfs_context *nfs, const char *url, i
return NULL;
}
return NULL;
}
+ memset(urls, 0x00, sizeof(struct nfs_url));
urls->server = strdup(url + 6);
if (urls->server == NULL) {
nfs_destroy_url(urls);
urls->server = strdup(url + 6);
if (urls->server == NULL) {
nfs_destroy_url(urls);
@@
-277,11
+278,6
@@
flags:
}
}
}
}
- if (urls->server && strlen(urls->server) <= 1) {
- free(urls->server);
- urls->server = NULL;
- }
-
while (flagsp != NULL && *(flagsp+1) != 0) {
strp = flagsp + 1;
flagsp = strchr(strp, '&');
while (flagsp != NULL && *(flagsp+1) != 0) {
strp = flagsp + 1;
flagsp = strchr(strp, '&');
@@
-296,6
+292,11
@@
flags:
}
}
}
}
+ if (urls->server && strlen(urls->server) <= 1) {
+ free(urls->server);
+ urls->server = NULL;
+ }
+
return urls;
}
return urls;
}
@@
-652,7
+653,7
@@
static void nfs_mount_7_cb(struct rpc_context *rpc, int status, void *command_da
return;
}
return;
}
- if (rpc_nfs_null_async(rpc, nfs_mount_8_cb, data) != 0) {
+ if (rpc_nfs
3
_null_async(rpc, nfs_mount_8_cb, data) != 0) {
data->cb(-ENOMEM, nfs, command_data, data->private_data);
free_nfs_cb_data(data);
return;
data->cb(-ENOMEM, nfs, command_data, data->private_data);
free_nfs_cb_data(data);
return;
@@
-726,7
+727,7
@@
static void nfs_mount_5_cb(struct rpc_context *rpc, int status, void *command_da
return;
}
return;
}
- if (rpc_mount_mnt_async(rpc, nfs_mount_6_cb, nfs->export, data) != 0) {
+ if (rpc_mount
3
_mnt_async(rpc, nfs_mount_6_cb, nfs->export, data) != 0) {
data->cb(-ENOMEM, nfs, command_data, data->private_data);
free_nfs_cb_data(data);
return;
data->cb(-ENOMEM, nfs, command_data, data->private_data);
free_nfs_cb_data(data);
return;
@@
-754,7
+755,7
@@
static void nfs_mount_4_cb(struct rpc_context *rpc, int status, void *command_da
return;
}
return;
}
- if (rpc_mount_null_async(rpc, nfs_mount_5_cb, data) != 0) {
+ if (rpc_mount
3
_null_async(rpc, nfs_mount_5_cb, data) != 0) {
data->cb(-ENOMEM, nfs, command_data, data->private_data);
free_nfs_cb_data(data);
return;
data->cb(-ENOMEM, nfs, command_data, data->private_data);
free_nfs_cb_data(data);
return;
@@
-3916,7
+3917,7
@@
static void mount_export_4_cb(struct rpc_context *rpc, int status, void *command
return;
}
return;
}
- if (rpc_mount_export_async(rpc, mount_export_5_cb, data) != 0) {
+ if (rpc_mount
3
_export_async(rpc, mount_export_5_cb, data) != 0) {
data->cb(rpc, -ENOMEM, command_data, data->private_data);
free_mount_cb_data(data);
return;
data->cb(rpc, -ENOMEM, command_data, data->private_data);
free_mount_cb_data(data);
return;