read_wim_security_data(): Fix comment, make prototype consistent

diff --git a/include/wimlib/security.h b/include/wimlib/security.h
index 953f88862f00260d7e32429dc35029b018639474..f81bb04a64813570e761e6e05ffd557762cd0de6 100644 (file)
--- a/include/wimlib/security.h
+++ b/include/wimlib/security.h
@@ -52,12 +52,12 @@ extern struct wim_security_data *
 new_wim_security_data(void);
 
 extern int
-read_wim_security_data(const u8 metadata_resource[], size_t
-                      metadata_resource_len, struct wim_security_data **sd_p);
+read_wim_security_data(const u8 *buf, size_t buf_len,
+                      struct wim_security_data **sd_ret);
 
 extern u8 *
-write_wim_security_data(const struct wim_security_data * restrict sd, u8 *
-                       restrict p);
+write_wim_security_data(const struct wim_security_data * restrict sd,
+                       u8 * restrict p);
 
 extern void
 print_wim_security_data(const struct wim_security_data *sd);

diff --git a/src/security.c b/src/security.c
index cc7f633ad1e245c333460db8e06b4f4b73545afd..12cfcb4ce6ee5c3e335059472133558e92a7205c 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);