X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fsecurity.c;h=c084258e007961a52ee8e5794f39a01bf93dd9bd;hp=c955050054be0662c5fa95bef9a8524e95568e4c;hb=699b3220ae03778e1673d9980b273a78961b507e;hpb=7231431086332de22b2556477bcc5fc2c3e4bdcf

diff --git a/src/security.c b/src/security.c
index c9550500..c084258e 100644
--- a/src/security.c
+++ b/src/security.c
@@ -26,7 +26,7 @@
  */
 
 #include "wimlib_internal.h"
-#include "io.h"
+#include "buffer_io.h"
 #include "security.h"
 
 /*
@@ -250,7 +250,7 @@ static void print_acl(const u8 *p, const char *type)
 	printf("    ACE Count = %u\n", ace_count);
 
 	p += sizeof(ACL);
-	for (uint i = 0; i < acl->ace_count; i++) {
+	for (u16 i = 0; i < ace_count; i++) {
 		const ACEHeader *hdr = (const ACEHeader*)p;
 		printf("        [ACE]\n");
 		printf("        ACE type  = %d\n", hdr->type);
@@ -274,7 +274,7 @@ static void print_sid(const u8 *p, const char *type)
 	print_byte_field(sid->identifier_authority,
 			 sizeof(sid->identifier_authority));
 	putchar('\n');
-	for (uint i = 0; i < sid->sub_authority_count; i++)
+	for (u8 i = 0; i < sid->sub_authority_count; i++)
 		printf("    Subauthority %u = %u\n",
 		       i, le32_to_cpu(sid->sub_authority[i]));
 	putchar('\n');
@@ -328,17 +328,17 @@ void print_security_data(const struct wim_security_data *sd)
 
 void free_security_data(struct wim_security_data *sd)
 {
-	if (!sd)
-		return;
-	wimlib_assert(sd->refcnt != 0);
-	if (--sd->refcnt == 0) {
-		u8 **descriptors = sd->descriptors;
-		u32 num_entries  = sd->num_entries;
-		if (descriptors)
-			while (num_entries--)
-				FREE(*descriptors++);
-		FREE(sd->sizes);
-		FREE(sd->descriptors);
-		FREE(sd);
+	if (sd) {
+		wimlib_assert(sd->refcnt != 0);
+		if (--sd->refcnt == 0) {
+			u8 **descriptors = sd->descriptors;
+			u32 num_entries  = sd->num_entries;
+			if (descriptors)
+				while (num_entries--)
+					FREE(*descriptors++);
+			FREE(sd->sizes);
+			FREE(sd->descriptors);
+			FREE(sd);
+		}
 	}
 }