Commit Diff


commit - 6a996ec20ffc1ae030c0c56c85d0296d8164c4c4
commit + 81bab00246906b389f6e7d162196eb4a36b848c9
blob - fbea6f66ad2cfcf577795bf14ae099542a713815
blob + 9f7f5d886ac87f33323ac29a33dd993e38243bba
--- gmid.h
+++ 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")
@@ -87,16 +89,6 @@
 /* forward declaration */
 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;
@@ -437,12 +429,6 @@ void		 sandbox_logger_process(void);
 /* utf8.c */
 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 *);
blob - /dev/null
blob + 5b34fd3abfaa7bc2a5e96170bbef43d4d15402c3 (mode 644)
--- /dev/null
+++ iri.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2023 Omar Polo <op@omarpolo.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+struct iri {
+	char		*schema;
+	char		*host;
+	char		*port;
+	uint16_t	 port_no;
+	char		*path;
+	char		*query;
+	char		*fragment;
+};
+
+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 *);