1 files changed, 19 insertions, 24 deletions

diff --git a/cmd/sbc_harness/fs_harness_uptime_txt.c b/cmd/sbc_harness/fs_harness_uptime_txt.c
index 9216986..f7b755f 100644
--- a/cmd/sbc_harness/fs_harness_uptime_txt.c
+++ b/cmd/sbc_harness/fs_harness_uptime_txt.c
@@ -5,10 +5,10 @@
  */
 
 #include <stdio.h>  /* for snprintf() */
-#include <stdlib.h> /* for malloc(), free() */
 
 #include <libhw/generic/alarmclock.h>
 #include <util9p/static.h>
+#include <libmisc/alloc.h> /* for heap_alloc(), free() */
 
 #include "fs_harness_uptime_txt.h"
 
@@ -38,7 +38,7 @@ static struct lib9p_qid uptime_file_qid(struct uptime_file *self) {
 	};
 }
 
-static struct lib9p_stat uptime_file_stat(struct uptime_file *self, struct lib9p_srv_ctx *ctx) {
+static struct lib9p_srv_stat uptime_file_stat(struct uptime_file *self, struct lib9p_srv_ctx *ctx) {
 	assert(self);
 	assert(ctx);
 
@@ -52,36 +52,31 @@ static struct lib9p_stat uptime_file_stat(struct uptime_file *self, struct lib9p
 		size++;
 	size += 3;
 
-	return (struct lib9p_stat){
-		.kern_type                = 0,
-		.kern_dev                 = 0,
-		.file_qid                 = uptime_file_qid(self),
-		.file_mode                = 0444,
-		.file_atime               = UTIL9P_ATIME,
-		.file_mtime               = UTIL9P_MTIME,
-		.file_size                = size,
-		.file_name                = lib9p_str(self->name),
-		.file_owner_uid           = lib9p_str("root"),
-		.file_owner_gid           = lib9p_str("root"),
-		.file_last_modified_uid   = lib9p_str("root"),
-		.file_extension           = lib9p_str(NULL),
-		.file_owner_n_uid         = 0,
-		.file_owner_n_gid         = 0,
-		.file_last_modified_n_uid = 0,
+	return (struct lib9p_srv_stat){
+		.qid                 = uptime_file_qid(self),
+		.mode                = 0444,
+		.atime_sec           = UTIL9P_ATIME,
+		.mtime_sec           = UTIL9P_MTIME,
+		.size                = size,
+		.name                = lib9p_str(self->name),
+		.owner_uid           = { .name = lib9p_str("root"), .num  = 0 },
+		.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_stat) {
+                              struct lib9p_srv_stat) {
 	assert(self);
 	assert(ctx);
 
-	lib9p_error(&ctx->basectx, LINUX_EROFS, "read-only part of filesystem");
+	lib9p_error(&ctx->basectx, LIB9P_ERRNO_L_EROFS, "read-only part of filesystem");
 }
 static void uptime_file_remove(struct uptime_file *self, struct lib9p_srv_ctx *ctx) {
 	assert(self);
 	assert(ctx);
 
-	lib9p_error(&ctx->basectx, LINUX_EROFS, "read-only part of filesystem");
+	lib9p_error(&ctx->basectx, LIB9P_ERRNO_L_EROFS, "read-only part of filesystem");
 }
 
 LIB9P_SRV_NOTDIR(struct uptime_file, uptime_file);
@@ -91,7 +86,7 @@ static lo_interface lib9p_srv_fio uptime_file_fopen(struct uptime_file *self, st
 	assert(self);
 	assert(ctx);
 
-	struct uptime_fio *ret = malloc(sizeof(struct uptime_fio));
+	struct uptime_fio *ret = heap_alloc(1, struct uptime_fio);
 	ret->parent = self;
 	ret->buf_len = 0;
 
@@ -130,7 +125,7 @@ static void uptime_fio_pread(struct uptime_fio *self, struct lib9p_srv_ctx *ctx,
 
 	if (byte_offset > (uint64_t)self->buf_len) {
 		lib9p_error(&ctx->basectx,
-		            LINUX_EINVAL, "offset is past end-of-file length");
+		            LIB9P_ERRNO_L_EINVAL, "offset is past end-of-file length");
 		return;
 	}
 
@@ -151,6 +146,6 @@ static uint32_t uptime_fio_pwrite(struct uptime_fio *self, struct lib9p_srv_ctx
 	assert(self);
 	assert(ctx);
 
-	lib9p_error(&ctx->basectx, LINUX_EROFS, "read-only part of filesystem");
+	lib9p_error(&ctx->basectx, LIB9P_ERRNO_L_EROFS, "read-only part of filesystem");
 	return 0;
 }