Factor out the context specific functions into their own file.

cbootimage.c

 /**
  * Copyright (c) 2011 NVIDIA Corporation.  All rights reserved.
  *
  * See file CREDITS for list of people who contributed to this
  * project.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation; either version 2 of
  * the License, or (at your option) any later version.
@@ skipping 12 matching lines @@
 /*
  * cbootimage.c - Implementation of the cbootimage tool.
  */
 
 #include "cbootimage.h"
 #include "nvbctlib.h"
 #include "crypto.h"
 #include "data_layout.h"
 #include "parse.h"
 #include "set.h"
+#include "context.h"
 
 /*
  * Global data
  */
 int enable_debug                = 0;
 
 static int help_only            = 0; // Only print help & exit
 
 /*
  * Function prototypes
  */
 int main(int argc, char *argv[]);
 
-static int
-query_alloc(build_image_context *context,
-        nvbct_lib_id size_id,
-        u_int8_t **dst)
-{
-        u_int32_t size;
-
-        /* Note: 3rd argument not used in this particular query. */
-        if (context->bctlib.get_value(size_id,
-                        &size, context->bct) != 0)
-                return -ENODATA;
-        *dst = malloc(size);
-
-        if (*dst == NULL)
-                return -ENOMEM;
-
-        memset(*dst, 0, size);
-
-        return 0;
-}
-
-static void
-cleanup_context(build_image_context *context)
-{
-        destroy_block_list(context->memory);
-        destroy_addon_list(context->addon_tbl.addon_item_list);
-        free(context->bct);
-}
-
-static int
-init_context(build_image_context *context)
-{
-        int e = 0;
-
-        /* Set defaults */
-        context->memory = new_block_list();
-        context->journal_blk = 1; /* Default to 1st block */
-
-        /* Allocate space for the bct.
-         * Note that this is different from the old code which pointed directly
-         * into a memory image.
-         */
-        e = query_alloc(context, nvbct_lib_id_bct_size, &(context->bct));
-        if (e != 0)
-                goto fail;
-
-        context_set_value(context, token_page_size, 2048);
-        context_set_value(context, token_redundancy, 1);
-        context_set_value(context, token_version, 1);
-
-        return 0;
-
- fail:
-        cleanup_context(context);
-
-        return e;
-}
-
 int
 write_image_file(build_image_context *context)
 {
         assert(context != NULL);
 
         return write_block_raw(context);
 }
 
 static void
 usage(void)
@@ skipping 135 matching lines @@
  fail:
         /* Close the file(s). */
         if (context.raw_file)
                 fclose(context.raw_file);
 
         /* Clean up memory. */
         cleanup_context(&context);
 
         return e;
 }