Various fixups and checks to make scan-build happy

[petitboot] / lib / pb-config / pb-config.c

diff --git a/lib/pb-config/pb-config.c b/lib/pb-config/pb-config.c
index fbaa7cb908b04000f7ae8958516aff981183e003..735cd989725ec07760fafcae6ccf9208d9632cba 100644 (file)
--- a/lib/pb-config/pb-config.c
+++ b/lib/pb-config/pb-config.c
@@ -10,7 +10,8 @@
 static struct interface_config *config_copy_interface(struct config *ctx,
                struct interface_config *src)
 {
-       struct interface_config *dest = talloc(ctx, struct interface_config);
+       struct interface_config *dest = talloc_zero(ctx,
+                                               struct interface_config);
 
        memcpy(dest->hwaddr, src->hwaddr, sizeof(src->hwaddr));
        dest->ignore = src->ignore;
@@ -28,8 +29,11 @@ static struct interface_config *config_copy_interface(struct config *ctx,
                        talloc_strdup(dest, src->static_config.address);
                dest->static_config.gateway =
                        talloc_strdup(dest, src->static_config.gateway);
+               dest->static_config.url =
+                       talloc_strdup(dest, src->static_config.url);
                break;
        }
+       dest->override = src->override;
 
        return dest;
 }
@@ -39,7 +43,10 @@ struct config *config_copy(void *ctx, const struct config *src)
        struct config *dest;
        unsigned int i;
 
-       dest = talloc(ctx, struct config);
+       if (!src)
+               return NULL;
+
+       dest = talloc_zero(ctx, struct config);
        dest->autoboot_enabled = src->autoboot_enabled;
        dest->autoboot_timeout_sec = src->autoboot_timeout_sec;
        dest->safe_mode = src->safe_mode;
@@ -59,20 +66,43 @@ struct config *config_copy(void *ctx, const struct config *src)
                dest->network.dns_servers[i] = talloc_strdup(dest,
                                src->network.dns_servers[i]);
 
-       dest->n_boot_priorities = src->n_boot_priorities;
-       dest->boot_priorities = talloc_array(dest, struct boot_priority,
-                       src->n_boot_priorities);
+       dest->http_proxy = talloc_strdup(dest, src->http_proxy);
+       dest->https_proxy = talloc_strdup(dest, src->https_proxy);
+
+       dest->n_autoboot_opts = src->n_autoboot_opts;
+       dest->autoboot_opts = talloc_array(dest, struct autoboot_option,
+                                       dest->n_autoboot_opts);
+
+       for (i = 0; i < src->n_autoboot_opts; i++) {
+               dest->autoboot_opts[i].boot_type =
+                       src->autoboot_opts[i].boot_type;
+               if (src->autoboot_opts[i].boot_type == BOOT_DEVICE_TYPE)
+                       dest->autoboot_opts[i].type =
+                               src->autoboot_opts[i].type;
+               else
+                       dest->autoboot_opts[i].uuid =
+                               talloc_strdup(dest, src->autoboot_opts[i].uuid);
+       }
+
+       dest->ipmi_bootdev = src->ipmi_bootdev;
+       dest->ipmi_bootdev_persistent = src->ipmi_bootdev_persistent;
+       dest->ipmi_bootdev_mailbox = src->ipmi_bootdev_mailbox;
 
-       for (i = 0; i < src->n_boot_priorities; i++) {
-               dest->boot_priorities[i].priority =
-                                       src->boot_priorities[i].priority;
-               dest->boot_priorities[i].type = src->boot_priorities[i].type;
+       dest->allow_writes = src->allow_writes;
+
+       dest->n_consoles = src->n_consoles;
+       if (src->consoles) {
+               dest->consoles = talloc_array(dest, char *, src->n_consoles);
+               for (i = 0; i < src->n_consoles && src->n_consoles; i++)
+                       if (src->consoles[i])
+                               dest->consoles[i] = talloc_strdup(
+                                               dest->consoles,
+                                               src->consoles[i]);
        }
 
-       if (src->boot_device && strlen(src->boot_device))
-               dest->boot_device = talloc_strdup(dest, src->boot_device);
-       else
-               dest->boot_device = NULL;
+       if (src->boot_console)
+               dest->boot_console = talloc_strdup(dest, src->boot_console);
+       dest->manual_console = src->manual_console;
 
        if (src->lang && strlen(src->lang))
                dest->lang = talloc_strdup(dest, src->lang);