Move policy initialization to resources constructor

Yields cleaner resources initialization code.

Part of a series of patches meant to manually rebase the issue58-proper
branch.

diff --git a/src/asn1/signed_data.c b/src/asn1/signed_data.c
index 7d27dff960a77d088f652fec5d2bc258d4d5e637..535b51d6e41fee352edf934d3e686f9ce674c2ee 100644 (file)
--- a/src/asn1/signed_data.c
+++ b/src/asn1/signed_data.c
@@ -27,10 +27,7 @@ signed_object_args_init(struct signed_object_args *args,
     STACK_OF(X509_CRL) *crls,
     bool force_inherit)
 {
-       args->res = resources_create(force_inherit);
-       if (args->res == NULL)
-               enomem_panic();
-
+       args->res = resources_create(RPKI_POLICY_RFC6484, force_inherit);
        args->uri = uri;
        args->crls = crls;
        memset(&args->refs, 0, sizeof(args->refs));

diff --git a/src/cert_stack.c b/src/cert_stack.c
index f7a2520fa5fdeae65ef7448a763a33aa4bd173f3..492414dfd1302bebc5c9fd405efb7b167c453481 100644 (file)
--- a/src/cert_stack.c
+++ b/src/cert_stack.c
@@ -248,11 +248,8 @@ init_resources(X509 *x509, enum rpki_policy policy, enum cert_type type,
        struct resources *result;
        int error;
 
-       result = resources_create(false);
-       if (result == NULL)
-               enomem_panic();
+       result = resources_create(policy, false);
 
-       resources_set_policy(result, policy);
        error = certificate_get_resources(x509, result, type);
        if (error)
                goto fail;

diff --git a/src/resource.c b/src/resource.c
index df8d4a0654626f49e8ec277f09b5f2a6588b646c..0be670af13d5e9aa30974a6391e70f874a868435 100644 (file)
--- a/src/resource.c
+++ b/src/resource.c
@@ -31,7 +31,7 @@ struct resources {
 };
 
 struct resources *
-resources_create(bool force_inherit)
+resources_create(enum rpki_policy policy, bool force_inherit)
 {
        struct resources *result;
 
@@ -40,7 +40,7 @@ resources_create(bool force_inherit)
        result->ip4s = NULL;
        result->ip6s = NULL;
        result->asns = NULL;
-       result->policy = RPKI_POLICY_RFC6484;
+       result->policy = policy;
        result->force_inherit = force_inherit;
 
        return result;

diff --git a/src/resource.h b/src/resource.h
index 23055fd2875117f9d6bbd6859e405f89a026ff04..e18bed10d36077f8dc1fb9903d3ea63c490899f8 100644 (file)
--- a/src/resource.h
+++ b/src/resource.h
@@ -24,7 +24,7 @@ int get_addr_family(OCTET_STRING_t *);
 
 struct resources;
 
-struct resources *resources_create(bool);
+struct resources *resources_create(enum rpki_policy, bool);
 void resources_destroy(struct resources *);
 
 int resources_add_ip(struct resources *, struct IPAddressFamily *);