1 files changed, 11 insertions, 14 deletions

diff --git a/cmd/sbc_harness/fs_harness_uptime_txt.c b/cmd/sbc_harness/fs_harness_uptime_txt.c
index 021a8bd..4d35385 100644
--- a/cmd/sbc_harness/fs_harness_uptime_txt.c
+++ b/cmd/sbc_harness/fs_harness_uptime_txt.c
@@ -11,23 +11,21 @@
 
 #include "fs_harness_uptime_txt.h"
 
-LO_IMPLEMENTATION_C(lib9p_srv_file, struct uptime_file, uptime_file, static);
+LO_IMPLEMENTATION_C(lib9p_srv_file, struct uptime_file, uptime_file);
 
 struct uptime_fio {
 	struct uptime_file      *parent;
 	size_t                   buf_len;
 	char                     buf[24]; /* len(str(UINT64_MAX)+"ns\n\0") */
 };
-
-LO_IMPLEMENTATION_H(lib9p_srv_fio, struct uptime_fio, uptime_fio);
-LO_IMPLEMENTATION_C(lib9p_srv_fio, struct uptime_fio, uptime_fio, static);
+LO_IMPLEMENTATION_STATIC(lib9p_srv_fio, struct uptime_fio, uptime_fio);
 
 /* srv_file *******************************************************************/
 
-static void uptime_file_free(struct uptime_file *self) {
+void uptime_file_free(struct uptime_file *self) {
 	assert(self);
 }
-static struct lib9p_qid uptime_file_qid(struct uptime_file *self) {
+struct lib9p_qid uptime_file_qid(struct uptime_file *self) {
 	assert(self);
 
 	return (struct lib9p_qid){
@@ -37,7 +35,7 @@ static struct lib9p_qid uptime_file_qid(struct uptime_file *self) {
 	};
 }
 
-static lib9p_srv_stat_or_error uptime_file_stat(struct uptime_file *self, struct lib9p_srv_ctx *ctx) {
+lib9p_srv_stat_or_error uptime_file_stat(struct uptime_file *self, struct lib9p_srv_ctx *ctx) {
 	assert(self);
 	assert(ctx);
 
@@ -64,24 +62,23 @@ static lib9p_srv_stat_or_error uptime_file_stat(struct uptime_file *self, struct
 		.extension           = lib9p_str(NULL),
 	}));
 }
-static error uptime_file_wstat(struct uptime_file *self, struct lib9p_srv_ctx *ctx,
-                               struct lib9p_srv_stat) {
+error uptime_file_wstat(struct uptime_file *self, struct lib9p_srv_ctx *ctx, struct lib9p_srv_stat) {
 	assert(self);
 	assert(ctx);
 
 	return error_new(E_POSIX_EROFS, "read-only part of filesystem");
 }
-static error uptime_file_remove(struct uptime_file *self, struct lib9p_srv_ctx *ctx) {
+error uptime_file_remove(struct uptime_file *self, struct lib9p_srv_ctx *ctx) {
 	assert(self);
 	assert(ctx);
 
 	return error_new(E_POSIX_EROFS, "read-only part of filesystem");
 }
 
-LIB9P_SRV_NOTDIR(struct uptime_file, uptime_file);
+LIB9P_SRV_NOTDIR(, struct uptime_file, uptime_file);
 
-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)) {
+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);
 
@@ -104,7 +101,7 @@ static void uptime_fio_iofree(struct uptime_fio *self) {
 	free(self);
 }
 
-static struct lib9p_qid uptime_fio_qid(struct uptime_fio *self) {
+static struct lib9p_qid uptime_fio_ioqid(struct uptime_fio *self) {
 	assert(self);
 	assert(self->parent);
 	return uptime_file_qid(self->parent);