1.1 --- a/librazor/razor-internal.h	Mon Jun 30 08:51:26 2008 +0100
     1.2 +++ b/librazor/razor-internal.h	Tue Jan 06 16:00:32 2009 +0000
     1.3 @@ -82,7 +82,7 @@
     1.4  
     1.5  
     1.6  struct razor_set_section {
     1.7 -	uint32_t type;
     1.8 +	uint32_t name;
     1.9  	uint32_t offset;
    1.10  	uint32_t size;
    1.11  };
    1.12 @@ -90,25 +90,23 @@
    1.13  struct razor_set_header {
    1.14  	uint32_t magic;
    1.15  	uint32_t version;
    1.16 -	struct razor_set_section sections[0];
    1.17 +	uint32_t num_sections;
    1.18  };
    1.19  
    1.20 -#define RAZOR_MAGIC 		0x7a7a7a7a
    1.21 -#define RAZOR_DETAILS_MAGIC 	0x7a7a7a7b
    1.22 -#define RAZOR_FILES_MAGIC 	0x7a7a7a7c
    1.23 -#define RAZOR_VERSION 1
    1.24 +#define RAZOR_MAGIC 	0x525a4442
    1.25 +#define RAZOR_VERSION	1
    1.26  
    1.27 -#define RAZOR_STRING_POOL		0
    1.28 -#define RAZOR_PACKAGES			1
    1.29 -#define RAZOR_PROPERTIES		2
    1.30 -#define RAZOR_PACKAGE_POOL		3
    1.31 -#define RAZOR_PROPERTY_POOL		4
    1.32 +#define RAZOR_STRING_POOL		"string_pool"
    1.33 +#define RAZOR_PACKAGES			"packages"
    1.34 +#define RAZOR_PROPERTIES		"properties"
    1.35 +#define RAZOR_PACKAGE_POOL		"package_pool"
    1.36 +#define RAZOR_PROPERTY_POOL		"property_pool"
    1.37  
    1.38 -#define RAZOR_DETAILS_STRING_POOL	0
    1.39 +#define RAZOR_DETAILS_STRING_POOL	"details_string_pool"
    1.40  
    1.41 -#define RAZOR_FILES			0
    1.42 -#define RAZOR_FILE_POOL			1
    1.43 -#define RAZOR_FILE_STRING_POOL		2
    1.44 +#define RAZOR_FILES			"files"
    1.45 +#define RAZOR_FILE_POOL			"file_pool"
    1.46 +#define RAZOR_FILE_STRING_POOL		"file_string_pool"
    1.47  
    1.48  struct razor_package {
    1.49  	uint name  : 24;
    1.50 @@ -150,9 +148,15 @@
    1.51   	struct array file_pool;
    1.52  	struct array file_string_pool;
    1.53  	struct array details_string_pool;
    1.54 +
    1.55  	struct razor_set_header *header;
    1.56 +	size_t header_size;
    1.57 +
    1.58  	struct razor_set_header *details_header;
    1.59 +	size_t details_header_size;
    1.60 +
    1.61  	struct razor_set_header *files_header;
    1.62 +	size_t files_header_size;
    1.63  };
    1.64  
    1.65  struct import_entry {