some refactoring to disconnect doc_type from networking

1 files changed, 6 insertions, 13 deletions

diff --git a/net.h b/net.h
index c3e12ef..64048be 100644
--- a/net.h
+++ b/net.h
@@ -2,9 +2,10 @@
 #define NET_H
 
 #include "buf.h"
+#include "doc.h"
 
-#define HOST_MAX 256
-#define PATH_MAX 256
+#define HOST_MAX 255
+#define PATH_MAX 255
 
 enum protocol {
 	PROT_UNKNOWN,
@@ -13,22 +14,14 @@ enum protocol {
 	PROT_GEMINI,
 };
 
-enum doc_type {
-	DOC_UNKNOWN,
-	DOC_GOPHERDOC,
-	DOC_GEMTEXT,
-	DOC_PLAIN,
-};
-
 struct addr {
-	char host[HOST_MAX];
-	char path[PATH_MAX];
+	char host[HOST_MAX + 1];
+	char path[PATH_MAX + 1];
 	size_t host_len, path_len;
 	enum protocol prot;
-	enum doc_type type;
 };
 
 int net_addr(const char *url, struct addr *adr, enum protocol prot_default);
-int net_fetch(const struct addr *adr, struct buf *buf);
+int net_fetch(const struct addr *adr, struct buf *buf, enum doc_type *doct);
 
 #endif