split out iri.h from gmid.h

1 files changed, 2 insertions, 16 deletions

diff --git a/gmid.h b/gmid.h
index fbea6f6..9f7f5d8 100644
--- a/gmid.h
+++ b/gmid.h
@@ -50,6 +50,8 @@
 # include <event.h>
 #endif
 
+#include "iri.h"
+
 #define VERSION_STR(n)	n " " VERSION
 #define GE_STRING	VERSION_STR("ge")
 #define GG_STRING	VERSION_STR("gg")
@@ -88,16 +90,6 @@
 struct privsep;
 struct privsep_proc;
 
-struct iri {
-	char		*schema;
-	char		*host;
-	char		*port;
-	uint16_t	 port_no;
-	char		*path;
-	char		*query;
-	char		*fragment;
-};
-
 struct parser {
 	char		*iri;
 	struct iri	*parsed;
@@ -438,12 +430,6 @@ void		 sandbox_logger_process(void);
 int		 valid_multibyte_utf8(struct parser*);
 char		*utf8_nth(char*, size_t);
 
-/* iri.c */
-int		 parse_iri(char*, struct iri*, const char**);
-int		 serialize_iri(struct iri*, char*, size_t);
-int		 encode_path(char *, size_t, const char *);
-char		*pct_decode_str(char *);
-
 /* logger.c */
 void		 logger(struct privsep *, struct privsep_proc *);