Rename the "url" module to "uri"

diff --git a/src/Makefile.am b/src/Makefile.am
index 2ba315a6d6438c7da23155c194e1f3c907706da9..23650321df8a8a573dd51fee2730d0a65eb579f0 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -89,7 +89,7 @@ fort_SOURCES += types/rpp.h types/rpp.c
 fort_SOURCES += types/serial.h types/serial.c
 fort_SOURCES += types/sorted_array.h types/sorted_array.c
 fort_SOURCES += types/str.h types/str.c
-fort_SOURCES += types/url.c types/url.h
+fort_SOURCES += types/uri.c types/uri.h
 fort_SOURCES += types/uthash.h
 fort_SOURCES += types/vrp.c types/vrp.h
 fort_SOURCES += validation_handler.h validation_handler.c

diff --git a/src/asn1/asn1c/RsyncRequest.h b/src/asn1/asn1c/RsyncRequest.h
index 66f0478042b1e87e6941907d61616e0093deecf4..db9398dd0d566255e572674d35c9964a603a9712 100644 (file)
--- a/src/asn1/asn1c/RsyncRequest.h
+++ b/src/asn1/asn1c/RsyncRequest.h
@@ -9,7 +9,7 @@
 #define        _RsyncRequest_H_
 
 /* Including external dependencies */
-#include "types/url.h"
+#include "types/uri.h"
 #include "asn1/asn1c/OCTET_STRING.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 

diff --git a/src/cache.c b/src/cache.c
index 91dd653ccdfe70eaba5ea2862d62980e091659fc..568abda9f7f16df8b3ca1a2c6196736ee7e1176f 100644 (file)
--- a/src/cache.c
+++ b/src/cache.c
@@ -24,7 +24,7 @@
 #include "types/array.h"
 #include "types/path.h"
 #include "types/str.h"
-#include "types/url.h"
+#include "types/uri.h"
 #include "types/uthash.h"
 
 enum node_state {

diff --git a/src/cache.h b/src/cache.h
index 0b900b1a78fc22da6558e620e6486612c6d94c2f..c962df0fcff4821845863479c293c20588dde803 100644 (file)
--- a/src/cache.h
+++ b/src/cache.h
@@ -4,7 +4,7 @@
 #include <stdbool.h>
 #include "types/map.h"
 #include "types/rpp.h"
-#include "types/url.h"
+#include "types/uri.h"
 
 int cache_setup(void);         /* Init this module */
 void cache_atexit(void);

diff --git a/src/http.c b/src/http.c
index 177f4bd0b5770a66ec53a9336d3338f273060236..e455109579a567918c59f24bc5ea13b621692d09 100644 (file)
--- a/src/http.c
+++ b/src/http.c
@@ -5,7 +5,7 @@
 #include "config.h"
 #include "file.h"
 #include "log.h"
-#include "types/url.h"
+#include "types/uri.h"
 
 struct http_handler {
        CURL *curl;

diff --git a/src/http.h b/src/http.h
index 3992ddeb8dadaba81d8a72ed56639b589888b160..8f352d74cbcc0dba03a71efca5444152349bd197 100644 (file)
--- a/src/http.h
+++ b/src/http.h
@@ -4,7 +4,7 @@
 #include <curl/curl.h>
 #include <stdbool.h>
 
-#include "types/url.h"
+#include "types/uri.h"
 
 int http_init(void);
 void http_cleanup(void);

diff --git a/src/json_util.h b/src/json_util.h
index 9568aef3d10c0555e71915a56beffabeb5f84628..3e08b75bd1d4163d305d2771ecbf404ec781d235 100644 (file)
--- a/src/json_util.h
+++ b/src/json_util.h
@@ -18,7 +18,7 @@
 
 #include "asn1/asn1c/INTEGER.h"
 #include "file.h"
-#include "types/url.h"
+#include "types/uri.h"
 
 /*
  * Contract of get functions:

diff --git a/src/object/certificate.c b/src/object/certificate.c
index db1f8688cd4b8d963a6ecb448dbfc5634513fe21..17f453fe1f9a55b24d7c1bfd3ac24cb2c9191c41 100644 (file)
--- a/src/object/certificate.c
+++ b/src/object/certificate.c
@@ -30,7 +30,7 @@
 #include "types/name.h"
 #include "types/path.h"
 #include "types/str.h"
-#include "types/url.h"
+#include "types/uri.h"
 
 /*
  * The X509V3_EXT_METHOD that references NID_sinfo_access uses the AIA item.

diff --git a/src/object/manifest.c b/src/object/manifest.c
index b0ae10a34c4fbde9eadbcf6c84b00b0010a805cc..b8dc1a5d3448b684b67fe6eb003f169d1bd723fe 100644 (file)
--- a/src/object/manifest.c
+++ b/src/object/manifest.c
@@ -15,7 +15,7 @@
 #include "object/signed_object.h"
 #include "thread_var.h"
 #include "types/path.h"
-#include "types/url.h"
+#include "types/uri.h"
 
 static int
 decode_manifest(struct signed_object *sobj, struct Manifest **result)

diff --git a/src/object/tal.c b/src/object/tal.c
index db4de218fda2f877c596e223d7663687a6e9a5e7..d91b818686080416c45143f4a518626465e6d3de 100644 (file)
--- a/src/object/tal.c
+++ b/src/object/tal.c
@@ -15,7 +15,7 @@
 #include "thread_var.h"
 #include "types/path.h"
 #include "types/str.h"
-#include "types/url.h"
+#include "types/uri.h"
 
 struct tal {
        char const *file_name;

diff --git a/src/print_file.c b/src/print_file.c
index e7861c96a25ef22af1b38db9db855afa0889ef8e..d9f73fd5db4365ec2cb878ba9bc3a518b576dfb7 100644 (file)
--- a/src/print_file.c
+++ b/src/print_file.c
@@ -20,7 +20,7 @@
 #include "rsync.h"
 #include "types/bio_seq.h"
 #include "types/path.h"
-#include "types/url.h"
+#include "types/uri.h"
 
 #define HDRSIZE 32
 

diff --git a/src/rrdp.c b/src/rrdp.c
index e7b15f855b91e2c4abc5ebb235800b08ea9485f5..9972769d6b6a93ce4eee4bd0188dbe546f4a3e2c 100644 (file)
--- a/src/rrdp.c
+++ b/src/rrdp.c
@@ -19,7 +19,7 @@
 #include "types/arraylist.h"
 #include "types/path.h"
 #include "types/str.h"
-#include "types/url.h"
+#include "types/uri.h"
 #include "types/uthash.h"
 
 /* RRDP's XML namespace */

diff --git a/src/rrdp.h b/src/rrdp.h
index ad67a89878411deee20cebef4a350da33f668151..dad75f3ca1621f3f244a1fa62bfefbba705114cf 100644 (file)
--- a/src/rrdp.h
+++ b/src/rrdp.h
@@ -6,7 +6,7 @@
 #include <time.h>
 
 #include "file.h"
-#include "types/url.h"
+#include "types/uri.h"
 
 struct rrdp_state;
 

diff --git a/src/rsync.h b/src/rsync.h
index 5d451ca180a8f26ecfa75bfe77dcb52b1e128c99..2ad5d2382ead1200cb96bb0ff5d6a516a3b7dbd1 100644 (file)
--- a/src/rsync.h
+++ b/src/rsync.h
@@ -1,7 +1,7 @@
 #ifndef SRC_RSYNC_RSYNC_H_
 #define SRC_RSYNC_RSYNC_H_
 
-#include "types/url.h"
+#include "types/uri.h"
 
 void rsync_setup(char const *, ...);
 int rsync_queue(struct uri const *, char const *);

diff --git a/src/types/map.h b/src/types/map.h
index 7d0c06a21557a040e452b2c56dd3a6af832f754f..0e95428ed3409d6cd40f9dfe8db7ef7093e2ae5d 100644 (file)
--- a/src/types/map.h
+++ b/src/types/map.h
@@ -1,7 +1,7 @@
 #ifndef SRC_TYPES_MAP_H_
 #define SRC_TYPES_MAP_H_
 
-#include "types/url.h"
+#include "types/uri.h"
 
 // XXX document this better
 struct cache_mapping {

diff --git a/src/types/url.c b/src/types/uri.c
similarity index 99%
rename from src/types/url.c
rename to src/types/uri.c
index 67ccc8863edc29ed16d48453967fed251518585b..98bb6422eff53e3d03fad6b914b3c99b4f09c539 100644 (file)
--- a/src/types/url.c
+++ b/src/types/uri.c
@@ -1,4 +1,4 @@
-#include "types/url.h"
+#include "types/uri.h"
 
 #include <curl/curl.h>
 #include <errno.h>

diff --git a/src/types/url.h b/src/types/uri.h
similarity index 93%
rename from src/types/url.h
rename to src/types/uri.h
index f4f761a71419a815f9421b9607ef692c368b120b..bc2b11ead89e04493da060801544b5e6577301e2 100644 (file)
--- a/src/types/url.h
+++ b/src/types/uri.h
@@ -1,5 +1,5 @@
-#ifndef SRC_TYPES_URL_H_
-#define SRC_TYPES_URL_H_
+#ifndef SRC_TYPES_URI_H_
+#define SRC_TYPES_URI_H_
 
 #include <stdbool.h>
 #include <stddef.h>
@@ -38,4 +38,4 @@ void uri_child(struct uri const *, char const *, size_t, struct uri *);
 DEFINE_ARRAY_LIST_STRUCT(uris, struct uri);
 DECLARE_ARRAY_LIST_FUNCTIONS(uris, struct uri)
 
-#endif /* SRC_TYPES_URL_H_ */
+#endif /* SRC_TYPES_URI_H_ */

diff --git a/test/Makefile.am b/test/Makefile.am
index 0b44a83e2ab705f375eb12e7393cf255d178d8f3..dc056357223e21af9e97779f9ca7f6c90391cc28 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -117,9 +117,10 @@ check_PROGRAMS +=          thread_pool.test
 thread_pool_test_SOURCES =     thread_pool_test.c
 thread_pool_test_LDADD =       ${CHECK_LIBS}
 
-check_PROGRAMS +=              url.test
-url_test_SOURCES =             types/url_test.c
-url_test_LDADD =               ${CHECK_LIBS} ${CURL_LIBS}
+check_PROGRAMS +=              uri.test
+uri_test_SOURCES =             types/uri_test.c
+uri_test_LDADD =               ${CHECK_LIBS}
+uri_test_LDADD +=              ${CURL_LIBS}
 
 check_PROGRAMS +=              uthash.test
 uthash_test_SOURCES =          types/uthash_test.c

diff --git a/test/cache_test.c b/test/cache_test.c
index feb0f1d9fe280a0ec9ecd82a128cd92f3a188d0f..de5e554c8ba363ad80b9fd3445b14c7d41e00ef4 100644 (file)
--- a/test/cache_test.c
+++ b/test/cache_test.c
@@ -21,7 +21,7 @@
 #include "types/map.c"
 #include "types/path.c"
 #include "types/str.c"
-#include "types/url.c"
+#include "types/uri.c"
 
 /*
  * XXX

diff --git a/test/object/tal_test.c b/test/object/tal_test.c
index 20135aca8a0faa3def961ac43cbad18ed924e0ec..05c3b4815cefe7fe747a7dc963f5054577a6a9bf 100644 (file)
--- a/test/object/tal_test.c
+++ b/test/object/tal_test.c
@@ -9,7 +9,7 @@
 #include "mock.c"
 #include "types/path.c"
 #include "types/str.c"
-#include "types/url.c"
+#include "types/uri.c"
 
 static void
 check_spki(struct tal *tal)

diff --git a/test/rrdp_test.c b/test/rrdp_test.c
index 90c8ed4de6284f3a124efd6619c1d83311dcf5e2..7eaa97e15451e66c2ae36e6b0fca7045c06a4b26 100644 (file)
--- a/test/rrdp_test.c
+++ b/test/rrdp_test.c
@@ -12,7 +12,7 @@
 #include "relax_ng.c"
 #include "rrdp.c"
 #include "types/map.c"
-#include "types/url.c"
+#include "types/uri.c"
 
 START_TEST(test_xmlChar_NULL_assumption)
 {

diff --git a/test/rrdp_update_test.c b/test/rrdp_update_test.c
index 3f5f58ebc0c9e1032f7e49aac8649de93e0cff1f..29edf560211b8767088048465a3034f9d39378ff 100644 (file)
--- a/test/rrdp_update_test.c
+++ b/test/rrdp_update_test.c
@@ -15,7 +15,7 @@
 #include "types/map.c"
 #include "types/path.c"
 #include "types/str.c"
-#include "types/url.c"
+#include "types/uri.c"
 
 /* Utils */
 

diff --git a/test/rsync_test.c b/test/rsync_test.c
index 92cc6e26c0a2c1779cf84c922276c7bba475ae8a..bb4796327850c86a5371a05c472bb5f980f86202 100644 (file)
--- a/test/rsync_test.c
+++ b/test/rsync_test.c
@@ -6,7 +6,7 @@
 #include "rsync.c"
 #include "stream.c"
 #include "types/map.c"
-#include "types/url.c"
+#include "types/uri.c"
 
 #include "asn1/asn1c/ber_decoder.c"
 #include "asn1/asn1c/ber_tlv_length.c"

diff --git a/test/task_test.c b/test/task_test.c
index 3e9b33102e432212b2133de731713ec1b35cbf7b..136a4220c63f66325f7d5c971305530a50faaffd 100644 (file)
--- a/test/task_test.c
+++ b/test/task_test.c
@@ -7,7 +7,7 @@
 #include "mock.c"
 #include "types/array.h"
 #include "types/map.c"
-#include "types/url.c"
+#include "types/uri.c"
 
 void
 rpki_certificate_free(struct rpki_certificate *cert)

diff --git a/test/types/url_test.c b/test/types/uri_test.c
similarity index 99%
rename from test/types/url_test.c
rename to test/types/uri_test.c
index ab890a30d35b76b1378622692d1ca98696009bfe..bad9e15ce5aec9745b6e6a63aa1ea484dc136ff0 100644 (file)
--- a/test/types/url_test.c
+++ b/test/types/uri_test.c
@@ -5,7 +5,7 @@
 #include "common.c"
 #include "mock.c"
 #include "types/path.c"
-#include "types/url.c"
+#include "types/uri.c"
 
 #define TEST_NORMALIZE(dirty, clean)                                   \
        normal = url_normalize(dirty);                                  \