From: Alberto Leiva Popper Date: Wed, 30 Apr 2025 16:26:52 +0000 (-0600) Subject: Rename the "url" module to "uri" X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74edb2f15812515373a5ca33c57a14c75b3f3dbd;p=thirdparty%2FFORT-validator.git Rename the "url" module to "uri" --- diff --git a/src/Makefile.am b/src/Makefile.am index 2ba315a6..23650321 100644 --- 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 66f04780..db9398dd 100644 --- 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 91dd653c..568abda9 100644 --- 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 0b900b1a..c962df0f 100644 --- a/src/cache.h +++ b/src/cache.h @@ -4,7 +4,7 @@ #include #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 177f4bd0..e4551095 100644 --- 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 3992ddeb..8f352d74 100644 --- a/src/http.h +++ b/src/http.h @@ -4,7 +4,7 @@ #include #include -#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 9568aef3..3e08b75b 100644 --- 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 db1f8688..17f453fe 100644 --- 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 b0ae10a3..b8dc1a5d 100644 --- 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 db4de218..d91b8186 100644 --- 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 e7861c96..d9f73fd5 100644 --- 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 e7b15f85..9972769d 100644 --- 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 ad67a898..dad75f3c 100644 --- a/src/rrdp.h +++ b/src/rrdp.h @@ -6,7 +6,7 @@ #include #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 5d451ca1..2ad5d238 100644 --- 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 7d0c06a2..0e95428e 100644 --- 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 67ccc886..98bb6422 100644 --- a/src/types/url.c +++ b/src/types/uri.c @@ -1,4 +1,4 @@ -#include "types/url.h" +#include "types/uri.h" #include #include 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 f4f761a7..bc2b11ea 100644 --- 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 #include @@ -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 0b44a83e..dc056357 100644 --- 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 feb0f1d9..de5e554c 100644 --- 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 20135aca..05c3b481 100644 --- 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 90c8ed4d..7eaa97e1 100644 --- 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 3f5f58eb..29edf560 100644 --- 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 92cc6e26..bb479632 100644 --- 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 3e9b3310..136a4220 100644 --- 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 ab890a30..bad9e15c 100644 --- 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); \