X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=include%2Fwimlib%2Fblob_table.h;h=c5295820a744b12b19cfe3943d254adad10fd89e;hb=0ce21c13081441f53d88ef58fbeba957abb74574;hp=9dfca8dcc7171bfc8a81447a3375b8b2c66c3a73;hpb=b82856cb22783df0e19990eb68d3694753f52220;p=wimlib diff --git a/include/wimlib/blob_table.h b/include/wimlib/blob_table.h index 9dfca8dc..c5295820 100644 --- a/include/wimlib/blob_table.h +++ b/include/wimlib/blob_table.h @@ -108,7 +108,7 @@ struct blob_descriptor { struct wim_inode *back_inode; u32 back_stream_id; }; - }; + } _packed_attribute; /* union is SHA1_HASH_SIZE bytes */ /* Number of times this blob is referenced by file streams in WIM * images. See blob_decrement_refcnt() for information about the @@ -341,8 +341,7 @@ blob_to_wimlib_resource_entry(const struct blob_descriptor *blob, struct wimlib_resource_entry *wentry); extern int -sort_blob_list(struct list_head *blob_list, - size_t list_head_offset, +sort_blob_list(struct list_head *blob_list, size_t list_head_offset, int (*compar)(const void *, const void*)); extern int @@ -353,7 +352,7 @@ extern int cmp_blobs_by_sequential_order(const void *p1, const void *p2); static inline const struct blob_extraction_target * -blob_extraction_targets(struct blob_descriptor *blob) +blob_extraction_targets(const struct blob_descriptor *blob) { if (blob->out_refcnt <= ARRAY_LEN(blob->inline_blob_extraction_targets)) return blob->inline_blob_extraction_targets; @@ -402,8 +401,7 @@ after_blob_hashed(struct blob_descriptor *blob, struct blob_table *blob_table); extern int -hash_unhashed_blob(struct blob_descriptor *blob, - struct blob_table *blob_table, +hash_unhashed_blob(struct blob_descriptor *blob, struct blob_table *blob_table, struct blob_descriptor **blob_ret); extern struct blob_descriptor **