1 files changed, 19 insertions, 25 deletions

diff --git a/cmd/sbc_harness/fs_harness_uptime_txt.c b/cmd/sbc_harness/fs_harness_uptime_txt.c
index 339b410..021a8bd 100644
--- a/cmd/sbc_harness/fs_harness_uptime_txt.c
+++ b/cmd/sbc_harness/fs_harness_uptime_txt.c
@@ -37,7 +37,7 @@ static struct lib9p_qid uptime_file_qid(struct uptime_file *self) {
 	};
 }
 
-static struct lib9p_srv_stat uptime_file_stat(struct uptime_file *self, struct lib9p_srv_ctx *ctx) {
+static lib9p_srv_stat_or_error uptime_file_stat(struct uptime_file *self, struct lib9p_srv_ctx *ctx) {
 	assert(self);
 	assert(ctx);
 
@@ -51,7 +51,7 @@ static struct lib9p_srv_stat uptime_file_stat(struct uptime_file *self, struct l
 		size++;
 	size += 3;
 
-	return (struct lib9p_srv_stat){
+	return ERROR_NEW_VAL(lib9p_srv_stat, ((struct lib9p_srv_stat){
 		.qid                 = uptime_file_qid(self),
 		.mode                = 0444,
 		.atime_sec           = UTIL9P_ATIME,
@@ -62,26 +62,26 @@ static struct lib9p_srv_stat uptime_file_stat(struct uptime_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 uptime_file_wstat(struct uptime_file *self, struct lib9p_srv_ctx *ctx,
-                              struct lib9p_srv_stat) {
+static error uptime_file_wstat(struct uptime_file *self, struct lib9p_srv_ctx *ctx,
+                               struct lib9p_srv_stat) {
 	assert(self);
 	assert(ctx);
 
-	lib9p_error(&ctx->basectx, LIB9P_ERRNO_L_EROFS, "read-only part of filesystem");
+	return error_new(E_POSIX_EROFS, "read-only part of filesystem");
 }
-static void uptime_file_remove(struct uptime_file *self, struct lib9p_srv_ctx *ctx) {
+static error uptime_file_remove(struct uptime_file *self, struct lib9p_srv_ctx *ctx) {
 	assert(self);
 	assert(ctx);
 
-	lib9p_error(&ctx->basectx, LIB9P_ERRNO_L_EROFS, "read-only part of filesystem");
+	return error_new(E_POSIX_EROFS, "read-only part of filesystem");
 }
 
 LIB9P_SRV_NOTDIR(struct uptime_file, uptime_file);
 
-static lo_interface lib9p_srv_fio uptime_file_fopen(struct uptime_file *self, struct lib9p_srv_ctx *ctx,
-                                                    bool LM_UNUSED(rd), bool LM_UNUSED(wr), bool LM_UNUSED(trunc)) {
+static lib9p_srv_fio_or_error uptime_file_fopen(struct uptime_file *self, struct lib9p_srv_ctx *ctx,
+                                                bool LM_UNUSED(rd), bool LM_UNUSED(wr), bool LM_UNUSED(trunc)) {
 	assert(self);
 	assert(ctx);
 
@@ -89,7 +89,7 @@ static lo_interface lib9p_srv_fio uptime_file_fopen(struct uptime_file *self, st
 	ret->parent = self;
 	ret->buf_len = 0;
 
-	return lo_box_uptime_fio_as_lib9p_srv_fio(ret);
+	return ERROR_NEW_VAL(lib9p_srv_fio, LO_BOX(lib9p_srv_fio, ret));
 }
 
 /* srv_fio ********************************************************************/
@@ -110,41 +110,35 @@ static struct lib9p_qid uptime_fio_qid(struct uptime_fio *self) {
 	return uptime_file_qid(self->parent);
 }
 
-static void uptime_fio_pread(struct uptime_fio *self, struct lib9p_srv_ctx *ctx,
-                             uint32_t byte_count, uint64_t byte_offset,
-                             struct iovec *ret) {
+static iovec_or_error uptime_fio_pread(struct uptime_fio *self, struct lib9p_srv_ctx *ctx,
+                             uint32_t byte_count, uint64_t byte_offset) {
 	assert(self);
 	assert(ctx);
-	assert(ret);
 
 	if (byte_offset == 0 || self->buf_len == 0) {
 		uint64_t now = LO_CALL(bootclock, get_time_ns);
 		self->buf_len = fmt_snprint(self->buf, sizeof(self->buf), now, "ns\n");
 	}
 
-	if (byte_offset > (uint64_t)self->buf_len) {
-		lib9p_error(&ctx->basectx,
-		            LIB9P_ERRNO_L_EINVAL, "offset is past end-of-file length");
-		return;
-	}
+	if (byte_offset > (uint64_t)self->buf_len)
+		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 > self->buf_len)
 		end_off = self->buf_len;
-	*ret = (struct iovec){
+	return ERROR_NEW_VAL(iovec, ((struct iovec){
 		.iov_base = &self->buf[beg_off],
 		.iov_len = end_off-beg_off,
-	};
+	}));
 }
 
-static uint32_t uptime_fio_pwrite(struct uptime_fio *self, struct lib9p_srv_ctx *ctx,
+static uint32_t_or_error uptime_fio_pwrite(struct uptime_fio *self, struct lib9p_srv_ctx *ctx,
                                   void *LM_UNUSED(buf),
                                   uint32_t LM_UNUSED(byte_count),
                                   uint64_t LM_UNUSED(byte_offset)) {
 	assert(self);
 	assert(ctx);
 
-	lib9p_error(&ctx->basectx, LIB9P_ERRNO_L_EROFS, "read-only part of filesystem");
-	return 0;
+	return ERROR_NEW_ERR(uint32_t, error_new(E_POSIX_EROFS, "read-only part of filesystem"));
 }