security.c: Use int32_t for security IDs

[wimlib] / src / security.c

diff --git a/src/security.c b/src/security.c
index cc7f633ad1e245c333460db8e06b4f4b73545afd..e6a7e93a84d6001ed47f55afdfdfd8d3e2c1f395 100644 (file)
--- a/src/security.c
+++ b/src/security.c
@@ -50,12 +50,13 @@ new_wim_security_data(void)
 /*
  * Reads the security data from the metadata resource of a WIM image.
  *
- * @metadata_resource: An array that contains the uncompressed metadata
- *                             resource for the WIM image.
- * @metadata_resource_len:     The length of @metadata_resource.
- * @sd_ret:    A pointer to a pointer to a wim_security_data structure that
- *             will be filled in with a pointer to a new wim_security_data
- *             structure containing the security data on success.
+ * @buf
+ *     Buffer containing an uncompressed WIM metadata resource.
+ * @buf_len
+ *     Length of the uncompressed metadata resource, in bytes.
+ * @sd_ret
+ *     On success, a pointer to the resulting security data structure will be
+ *     returned here.
  *
  * Note: There is no `offset' argument because the security data is located at
  * the beginning of the metadata resource.
@@ -66,7 +67,7 @@ new_wim_security_data(void)
  *     WIMLIB_ERR_NOMEM
  */
 int
-read_wim_security_data(const u8 metadata_resource[], size_t metadata_resource_len,
+read_wim_security_data(const u8 *buf, size_t buf_len,
                       struct wim_security_data **sd_ret)
 {
        struct wim_security_data *sd;
@@ -77,14 +78,14 @@ read_wim_security_data(const u8 metadata_resource[], size_t metadata_resource_le
        const struct wim_security_data_disk *sd_disk;
        const u8 *p;
 
-       if (metadata_resource_len < 8)
+       if (buf_len < 8)
                return WIMLIB_ERR_INVALID_METADATA_RESOURCE;
 
        sd = new_wim_security_data();
        if (!sd)
                goto out_of_memory;
 
-       sd_disk = (const struct wim_security_data_disk*)metadata_resource;
+       sd_disk = (const struct wim_security_data_disk *)buf;
        sd->total_length = le32_to_cpu(sd_disk->total_length);
        sd->num_entries = le32_to_cpu(sd_disk->num_entries);
 
@@ -112,7 +113,7 @@ read_wim_security_data(const u8 metadata_resource[], size_t metadata_resource_le
         * integer, even though each security descriptor size is a 64-bit
         * integer.  This is stupid, and we need to be careful not to actually
         * let the security descriptor sizes be over 0xffffffff.  */
-       if (sd->total_length > metadata_resource_len)
+       if (sd->total_length > buf_len)
                goto out_invalid_sd;
 
        sizes_size = (u64)sd->num_entries * sizeof(u64);
@@ -231,7 +232,7 @@ free_wim_security_data(struct wim_security_data *sd)
 }
 
 struct sd_node {
-       int security_id;
+       int32_t security_id;
        u8 hash[SHA1_HASH_SIZE];
        struct avl_tree_node index_node;
 };
@@ -274,7 +275,7 @@ _avl_cmp_nodes_by_hash(const struct avl_tree_node *n1,
        return hashes_cmp(SD_NODE(n1)->hash, SD_NODE(n2)->hash);
 }
 
-/* Inserts a a new node into the security descriptor index tree.  Returns true
+/* Inserts a new node into the security descriptor index tree.  Returns true
  * if successful (not a duplicate).  */
 static bool
 insert_sd_node(struct wim_sd_set *set, struct sd_node *new)
@@ -285,7 +286,7 @@ insert_sd_node(struct wim_sd_set *set, struct sd_node *new)
 
 /* Returns the index of the security descriptor having a SHA1 message digest of
  * @hash.  If not found, return -1. */
-static int
+static int32_t
 lookup_sd(struct wim_sd_set *set, const u8 hash[SHA1_HASH_SIZE])
 {
        struct avl_tree_node *res;
@@ -306,11 +307,11 @@ lookup_sd(struct wim_sd_set *set, const u8 hash[SHA1_HASH_SIZE])
  * the security ID for it.  If a new security descriptor cannot be allocated,
  * return -1.
  */
-int
+int32_t
 sd_set_add_sd(struct wim_sd_set *sd_set, const char *descriptor, size_t size)
 {
        u8 hash[SHA1_HASH_SIZE];
-       int security_id;
+       int32_t security_id;
        struct sd_node *new;
        u8 **descriptors;
        u64 *sizes;