Merge branch 'lukeshu/9p-tidy'

1 files changed, 16 insertions, 20 deletions

diff --git a/lib9p/tests/test_server/fs_shutdown.c b/lib9p/tests/test_server/fs_shutdown.c
index e7375ef..d4ae67e 100644
--- a/lib9p/tests/test_server/fs_shutdown.c
+++ b/lib9p/tests/test_server/fs_shutdown.c
@@ -24,34 +24,29 @@ static void shutdown_file_free(struct shutdown_file *self) {
 static struct lib9p_qid shutdown_file_qid(struct shutdown_file *self) {
 	assert(self);
 	return (struct lib9p_qid){
-		.type = LIB9P_QT_FILE,
+		.type = LIB9P_QT_FILE | LIB9P_QT_APPEND,
 		.vers = 1,
 		.path = self->pathnum,
 	};
 }
 
-static struct lib9p_stat shutdown_file_stat(struct shutdown_file *self, struct lib9p_srv_ctx *ctx) {
+static struct lib9p_srv_stat shutdown_file_stat(struct shutdown_file *self, struct lib9p_srv_ctx *ctx) {
 	assert(self);
 	assert(ctx);
-	return (struct lib9p_stat){
-		.kern_type                = 0,
-		.kern_dev                 = 0,
-		.file_qid                 = shutdown_file_qid(self),
-		.file_mode                = 0222,
-		.file_atime               = UTIL9P_ATIME,
-		.file_mtime               = UTIL9P_MTIME,
-		.file_size                = 0,
-		.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                 = shutdown_file_qid(self),
+		.mode                = 0222 | LIB9P_DM_APPEND,
+		.atime_sec           = UTIL9P_ATIME,
+		.mtime_sec           = UTIL9P_MTIME,
+		.size                = 0,
+		.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 shutdown_file_wstat(struct shutdown_file *self, struct lib9p_srv_ctx *ctx, struct lib9p_stat) {
+static void shutdown_file_wstat(struct shutdown_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");
@@ -91,10 +86,11 @@ static uint32_t shutdown_fio_iounit(struct shutdown_fio *self) {
 	return 0;
 }
 
-static uint32_t shutdown_fio_pwrite(struct shutdown_fio *self, struct lib9p_srv_ctx *ctx, void *buf, uint32_t byte_count, uint64_t LM_UNUSED(offset)) {
+static uint32_t shutdown_fio_pwrite(struct shutdown_fio *self, struct lib9p_srv_ctx *ctx, void *buf, uint32_t byte_count, uint64_t offset) {
 	assert(self);
 	assert(ctx);
 	assert(buf);
+	assert(offset == 0);
 	if (byte_count == 0)
 		return 0;
 	for (size_t i = 0; i < self->parent->nlisteners; i++)