OSS
/
go-libzfs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev-zfs-0.7.x'

This commit is contained in:
Faruk Kasumovic 2019-06-20 21:28:44 +02:00
parent 29b1f8314d 3805d8a4c1
commit 8bf9664c9c
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common.c
View File

@ -32,13 +32,11 @@ property_list_t *new_property_list() {
} }
void free_properties(property_list_t *root) { void free_properties(property_list_t *root) {
if (root != 0) {
property_list_t *tmp = 0; property_list_t *tmp = 0;
do { while(root) {
tmp = root->pnext; tmp = root->pnext;
free(root); free(root);
root = tmp; root = tmp;
} while(tmp);
} }
} }

2
sendrecv.go
View File

@ -241,7 +241,7 @@ func (d *Dataset) SendSize(FromName string, flags SendFlags) (size int64, err er
errch <- tmpe errch <- tmpe
}() }()
r.SetReadDeadline(time.Now().Add(15 * time.Second)) r.SetReadDeadline(time.Now().Add(60 * time.Second))
var data []byte var data []byte
if data, err = ioutil.ReadAll(r); err != nil { if data, err = ioutil.ReadAll(r); err != nil {
return return