1 files changed, 20 insertions, 25 deletions

diff --git a/lib9p/tests/test_server/fs_whoami.c b/lib9p/tests/test_server/fs_whoami.c
index 7e1d635..3cc0683 100644
--- a/lib9p/tests/test_server/fs_whoami.c
+++ b/lib9p/tests/test_server/fs_whoami.c
@@ -53,11 +53,11 @@ static struct lib9p_qid whoami_file_qid(struct whoami_file *self) {
 	};
 }
 
-static struct lib9p_srv_stat whoami_file_stat(struct whoami_file *self, struct lib9p_srv_ctx *ctx) {
+static lib9p_srv_stat_or_error whoami_file_stat(struct whoami_file *self, struct lib9p_srv_ctx *ctx) {
 	assert(self);
 	assert(ctx);
 
-	return (struct lib9p_srv_stat){
+	return ERROR_NEW_VAL(lib9p_srv_stat, ((struct lib9p_srv_stat){
 		.qid                 = whoami_file_qid(self),
 		.mode                = 0444,
 		.atime_sec           = UTIL9P_ATIME,
@@ -68,22 +68,22 @@ static struct lib9p_srv_stat whoami_file_stat(struct whoami_file *self, struct l
 		.owner_gid           = { .name=lib9p_str("root"), .num=0 },
 		.last_modifier_uid   = { .name=lib9p_str("root"), .num=0 },
 		.extension           = lib9p_str(NULL),
-	};
+	}));
 }
-static void whoami_file_wstat(struct whoami_file *self, struct lib9p_srv_ctx *ctx, struct lib9p_srv_stat) {
+static error whoami_file_wstat(struct whoami_file *self, struct lib9p_srv_ctx *ctx, struct lib9p_srv_stat) {
 	assert(self);
 	assert(ctx);
-	lib9p_error(&ctx->basectx, LIB9P_ERRNO_L_EROFS, "cannot wstat API file");
+	return error_new(E_POSIX_EROFS, "cannot wstat API file");
 }
-static void whoami_file_remove(struct whoami_file *self, struct lib9p_srv_ctx *ctx) {
+static error whoami_file_remove(struct whoami_file *self, struct lib9p_srv_ctx *ctx) {
 	assert(self);
 	assert(ctx);
-	lib9p_error(&ctx->basectx, LIB9P_ERRNO_L_EROFS, "cannot remove API file");
+	return error_new(E_POSIX_EROFS, "cannot remove API file");
 }
 
-LIB9P_SRV_NOTDIR(struct whoami_file, whoami_file)
+LIB9P_SRV_NOTDIR(struct whoami_file, whoami_file);
 
-static lo_interface lib9p_srv_fio whoami_file_fopen(struct whoami_file *self, struct lib9p_srv_ctx *ctx, bool, bool, bool) {
+static lib9p_srv_fio_or_error whoami_file_fopen(struct whoami_file *self, struct lib9p_srv_ctx *ctx, bool, bool, bool) {
 	assert(self);
 	assert(ctx);
 
@@ -92,7 +92,7 @@ static lo_interface lib9p_srv_fio whoami_file_fopen(struct whoami_file *self, st
 	ret->buf_len = 0;
 	ret->buf = NULL;
 
-	return lo_box_whoami_fio_as_lib9p_srv_fio(ret);
+	return ERROR_NEW_VAL(lib9p_srv_fio, LO_BOX(lib9p_srv_fio, ret));
 }
 
 /* srv_fio ********************************************************************/
@@ -115,18 +115,16 @@ static uint32_t whoami_fio_iounit(struct whoami_fio *self) {
 	return 0;
 }
 
-static uint32_t whoami_fio_pwrite(struct whoami_fio *LM_UNUSED(self),
-                                     struct lib9p_srv_ctx *LM_UNUSED(ctx),
-                                     void *LM_UNUSED(buf), uint32_t LM_UNUSED(byte_count),
-                                     uint64_t LM_UNUSED(offset)) {
+static uint32_t_or_error whoami_fio_pwrite(struct whoami_fio *LM_UNUSED(self),
+                                           struct lib9p_srv_ctx *LM_UNUSED(ctx),
+                                           void *LM_UNUSED(buf), uint32_t LM_UNUSED(byte_count),
+                                           uint64_t LM_UNUSED(offset)) {
 	assert_notreached("not writable");
 }
-static void whoami_fio_pread(struct whoami_fio *self, struct lib9p_srv_ctx *ctx,
-                             uint32_t byte_count, uint64_t byte_offset,
-                             struct iovec *ret) {
+static iovec_or_error whoami_fio_pread(struct whoami_fio *self, struct lib9p_srv_ctx *ctx,
+                                       uint32_t byte_count, uint64_t byte_offset) {
 	assert(self);
 	assert(ctx);
-	assert(ret);
 
 	size_t data_size = whoami_len(ctx);
 	if (self->buf_len < data_size+1) {
@@ -136,19 +134,16 @@ static void whoami_fio_pread(struct whoami_fio *self, struct lib9p_srv_ctx *ctx,
 	snprintf(self->buf, self->buf_len, "%"PRIu32" %.*s\n",
 	         ctx->user->num, ctx->user->name.len, ctx->user->name.utf8);
 
-	if (byte_offset > (uint64_t)data_size) {
-		lib9p_error(&ctx->basectx,
-		            LIB9P_ERRNO_L_EINVAL, "offset is past end-of-file length");
-		return;
-	}
+	if (byte_offset > (uint64_t)data_size)
+		return ERROR_NEW_ERR(iovec, error_new(E_POSIX_EINVAL, "offset is past end-of-file length"));
 
 	size_t beg_off = (size_t)byte_offset;
 	size_t end_off = beg_off + (size_t)byte_count;
 	if (end_off > data_size)
 		end_off = data_size;
 
-	*ret = (struct iovec){
+	return ERROR_NEW_VAL(iovec, ((struct iovec){
 		.iov_base = &self->buf[beg_off],
 		.iov_len = end_off-beg_off,
-	};
+	}));
 }