From ce05175372a9ddca1a225db0765ace1127a39293 Mon Sep 17 00:00:00 2001
From: Nicholas <nbnoll@eml.cc>
Date: Fri, 12 Nov 2021 09:22:01 -0800
Subject: chore: simplified organizational structure

---
 sys/base/gz/flush.c     |  7 -------
 sys/base/gz/get.c       | 17 -----------------
 sys/base/gz/interface.c | 12 ------------
 sys/base/gz/internal.h  |  6 ------
 sys/base/gz/open.c      | 13 -------------
 sys/base/gz/printf.c    | 15 ---------------
 sys/base/gz/put.c       |  7 -------
 sys/base/gz/putstring.c |  8 --------
 sys/base/gz/read.c      | 16 ----------------
 sys/base/gz/rules.mk    | 11 -----------
 sys/base/gz/seek.c      |  7 -------
 sys/base/gz/write.c     |  7 -------
 12 files changed, 126 deletions(-)
 delete mode 100644 sys/base/gz/flush.c
 delete mode 100644 sys/base/gz/get.c
 delete mode 100644 sys/base/gz/interface.c
 delete mode 100644 sys/base/gz/internal.h
 delete mode 100644 sys/base/gz/open.c
 delete mode 100644 sys/base/gz/printf.c
 delete mode 100644 sys/base/gz/put.c
 delete mode 100644 sys/base/gz/putstring.c
 delete mode 100644 sys/base/gz/read.c
 delete mode 100644 sys/base/gz/rules.mk
 delete mode 100644 sys/base/gz/seek.c
 delete mode 100644 sys/base/gz/write.c

(limited to 'sys/base/gz')

diff --git a/sys/base/gz/flush.c b/sys/base/gz/flush.c
deleted file mode 100644
index 011a3ab..0000000
--- a/sys/base/gz/flush.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "internal.h"
-
-error
-gz·flush(gz·Stream *s)
-{
-    return gzflush(s, Z_FINISH);
-}
diff --git a/sys/base/gz/get.c b/sys/base/gz/get.c
deleted file mode 100644
index 24ba23a..0000000
--- a/sys/base/gz/get.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "internal.h"
-
-byte
-gz·getbyte(gz·Stream *s)
-{
-    // NOTE: Can't call macro
-    byte b[2];
-    gzread(s, b, 1);
-
-    return b[0];
-}
-
-error
-gz·ungetbyte(gz·Stream *s, byte c)
-{
-    return gzungetc(c, s);
-}
diff --git a/sys/base/gz/interface.c b/sys/base/gz/interface.c
deleted file mode 100644
index 15b8f10..0000000
--- a/sys/base/gz/interface.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "internal.h"
-
-io·Reader     gz·Reader     = (io·Reader){ gz·read };
-io·Peeker     gz·Peeker     = (io·Peeker){ gz·getbyte, gz·ungetbyte };
-io·Seeker     gz·Seeker     = (io·Seeker){ gz·seek, gz·tell };
-io·PeekReader gz·Peekreader = (io·PeekReader){ gz·read, gz·getbyte, gz·ungetbyte };
-
-io·Writer     gz·Writer     = (io·Writer){ gz·write };
-io·Putter     gz·Putter     = (io·Putter){ gz·putbyte, gz·putstring };
-io·PutWriter  gz·PutWriter  = (io·PutWriter){ gz·write, gz·putbyte, gz·putstring };
-
-io·ReadWriter gz·ReadWriter = (io·ReadWriter){ gz·read, gz·write };
diff --git a/sys/base/gz/internal.h b/sys/base/gz/internal.h
deleted file mode 100644
index 6a268c4..0000000
--- a/sys/base/gz/internal.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-#include <u.h>
-#include <base.h>
-
-#include <zlib.h>
diff --git a/sys/base/gz/open.c b/sys/base/gz/open.c
deleted file mode 100644
index c84ce5e..0000000
--- a/sys/base/gz/open.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "internal.h"
-
-gz·Stream*
-gz·open(byte *path, byte *mode)
-{
-    return gzopen(path, mode);
-}
-
-error
-gz·close(gz·Stream* s)
-{
-    return gzclose(s);
-}
diff --git a/sys/base/gz/printf.c b/sys/base/gz/printf.c
deleted file mode 100644
index d7f75cf..0000000
--- a/sys/base/gz/printf.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "internal.h"
-
-int
-gz·printf(gz·Stream *s, byte *fmt, ...)
-{
-    error err;
-
-    va_list args;
-    va_start(args, fmt);
-    err = gzprintf(s, fmt, args);
-    va_end(args);
-
-    return err;
-}
-
diff --git a/sys/base/gz/put.c b/sys/base/gz/put.c
deleted file mode 100644
index fa9807d..0000000
--- a/sys/base/gz/put.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "internal.h"
-
-error
-gz·putbyte(gz·Stream *s, byte c)
-{
-    return gzputc(s, c);
-}
diff --git a/sys/base/gz/putstring.c b/sys/base/gz/putstring.c
deleted file mode 100644
index 64ff470..0000000
--- a/sys/base/gz/putstring.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "internal.h"
-
-error
-gz·putstring(gz·Stream *s, byte *str)
-{
-    return gzputs(s, str);
-}
-
diff --git a/sys/base/gz/read.c b/sys/base/gz/read.c
deleted file mode 100644
index 112fe4d..0000000
--- a/sys/base/gz/read.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "internal.h"
-
-int
-gz·read(gz·Stream *s, int sz, int n, void* buf)
-{
-    return gzread(s, buf, n*sz);
-}
-
-int
-gz·readln(gz·Stream *s, int n, byte *buf)
-{
-    byte* b;
-    b = gzgets(s, buf, n);
-
-    return strlen(b);
-}
diff --git a/sys/base/gz/rules.mk b/sys/base/gz/rules.mk
deleted file mode 100644
index a933291..0000000
--- a/sys/base/gz/rules.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-SRCS_$(d)+=\
-	$(d)/gz/flush.c\
-	$(d)/gz/get.c\
-	$(d)/gz/interface.c\
-	$(d)/gz/open.c\
-	$(d)/gz/printf.c\
-	$(d)/gz/put.c\
-	$(d)/gz/putstring.c\
-	$(d)/gz/read.c\
-	$(d)/gz/seek.c\
-	$(d)/gz/write.c\
diff --git a/sys/base/gz/seek.c b/sys/base/gz/seek.c
deleted file mode 100644
index 328886d..0000000
--- a/sys/base/gz/seek.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "internal.h"
-
-int
-gz·seek(gz·Stream *s, long off, enum SeekPos whence)
-{
-    return gzseek(s, off, whence);
-}
diff --git a/sys/base/gz/write.c b/sys/base/gz/write.c
deleted file mode 100644
index 862d833..0000000
--- a/sys/base/gz/write.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "internal.h"
-
-int
-gz·write(gz·Stream *s, int sz, int n, void* buf)
-{
-    return gzwrite(s, buf, n*sz);
-}
-- 
cgit v1.2.1