Mercurial > nomad
changeset 800:f679541c8142
switch to new buffer_init_static libjeffpc API
The function gained a second size argument removing the need for some
truncate calls.
Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
| author | Josef 'Jeff' Sipek <jeffpc@josefsipek.net> |
|---|---|
| date | Fri, 03 Apr 2020 15:54:51 -0400 |
| parents | 4b569a84039a |
| children | 610dea97626e |
| files | src/client/main.c src/common/fscall.c src/objstore/dirblock.c src/objstore/obj_dir.c src/objstore/obj_ops.c |
| diffstat | 5 files changed, 9 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/client/main.c Fri Apr 03 15:55:09 2020 -0400 +++ b/src/client/main.c Fri Apr 03 15:54:51 2020 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2019 Josef 'Jeff' Sipek <jeffpc@josefsipek.net> + * Copyright (c) 2015-2020 Josef 'Jeff' Sipek <jeffpc@josefsipek.net> * Copyright (c) 2015 Holly Sipek * Copyright (c) 2016 Steve Dougherty * @@ -52,7 +52,7 @@ offsetof(struct ohandle, node)); buffer_init_static(&conn.rpc_buffer, conn._rpc_buffer, - sizeof(conn._rpc_buffer), true); + 0, sizeof(conn._rpc_buffer), true); cmn_err(CE_DEBUG, "%s: fd = %d, arg = %p", __func__, fd, arg);
--- a/src/common/fscall.c Fri Apr 03 15:55:09 2020 -0400 +++ b/src/common/fscall.c Fri Apr 03 15:54:51 2020 -0400 @@ -39,7 +39,8 @@ header.opcode = opcode; - buffer_init_static(&rpc_buffer, _rpc_buffer, sizeof(_rpc_buffer), true); + buffer_init_static(&rpc_buffer, _rpc_buffer, 0, sizeof(_rpc_buffer), + true); xdrfd_create(&xdr, fd, &rpc_buffer, XDR_ENCODE);
--- a/src/objstore/dirblock.c Fri Apr 03 15:55:09 2020 -0400 +++ b/src/objstore/dirblock.c Fri Apr 03 15:54:51 2020 -0400 @@ -65,6 +65,7 @@ /* save the targets */ buffer_init_static(&tgtbuf, &raw[dirent->tgtoff], + DIR_BLOCK_SIZE - dirent->tgtoff, DIR_BLOCK_SIZE - dirent->tgtoff, false); non_deleted_targets = 0;
--- a/src/objstore/obj_dir.c Fri Apr 03 15:55:09 2020 -0400 +++ b/src/objstore/obj_dir.c Fri Apr 03 15:54:51 2020 -0400 @@ -158,6 +158,7 @@ return -ENOTUNIQ; buffer_init_static(&tgtbuf, &raw[ent.tgtoff], + DIR_BLOCK_SIZE - ent.tgtoff, DIR_BLOCK_SIZE - ent.tgtoff, false); /* @@ -247,6 +248,7 @@ goto err; buffer_init_static(&tgtbuf, &raw[ent.tgtoff], + DIR_BLOCK_SIZE - ent.tgtoff, DIR_BLOCK_SIZE - ent.tgtoff, false); for (i = 0, j = 0; i < ent.ntgts; i++) { @@ -355,6 +357,7 @@ buffer_init_static(&tgtbuf, &raw[dirent.tgtoff], DIR_BLOCK_SIZE - dirent.tgtoff, + DIR_BLOCK_SIZE - dirent.tgtoff, false); /*
--- a/src/objstore/obj_ops.c Fri Apr 03 15:55:09 2020 -0400 +++ b/src/objstore/obj_ops.c Fri Apr 03 15:54:51 2020 -0400 @@ -350,7 +350,7 @@ obj_setattr(&txn, open->ver, &attrs, OBJ_ATTR_SIZE); } - buffer_init_static(&buffer, buf, len, false); + buffer_init_static(&buffer, buf, len, len, false); obj_write(&txn, open->ver, &buffer, offset); err_txn: