From: Tim Kientzle <kientzle@gmail.com>
Date: Fri, 20 Dec 2013 05:25:34 +0000 (-0800)
Subject: Style:  Don't check for entry being non-NULL (none
X-Git-Tag: v3.1.900a~345
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22d76265e4c129e5c3be0a61e6f7510cd3cb709e;p=thirdparty%2Flibarchive.git

Style:  Don't check for entry being non-NULL (none
of the archive_entry routines do this); adjust
some indentation to match the other code.
---

diff --git a/libarchive/archive_entry.c b/libarchive/archive_entry.c
index 27f79ecae..293c7016a 100644
--- a/libarchive/archive_entry.c
+++ b/libarchive/archive_entry.c
@@ -701,19 +701,19 @@ _archive_entry_uname_l(struct archive_entry *entry,
 int
 archive_entry_is_data_encrypted(struct archive_entry *entry)
 {
-	return (entry && (entry->encryption & AE_ENCRYPTION_DATA) == AE_ENCRYPTION_DATA);
+	return ((entry->encryption & AE_ENCRYPTION_DATA) == AE_ENCRYPTION_DATA);
 }
 
 int
 archive_entry_is_metadata_encrypted(struct archive_entry *entry)
 {
-	return (entry && (entry->encryption & AE_ENCRYPTION_METADATA) == AE_ENCRYPTION_METADATA);
+	return ((entry->encryption & AE_ENCRYPTION_METADATA) == AE_ENCRYPTION_METADATA);
 }
 
 int
 archive_entry_is_encrypted(struct archive_entry *entry)
 {
-	return (entry && entry->encryption & (AE_ENCRYPTION_DATA|AE_ENCRYPTION_METADATA));
+	return (entry->encryption & (AE_ENCRYPTION_DATA|AE_ENCRYPTION_METADATA));
 }
 
 /*
@@ -1240,25 +1240,21 @@ archive_entry_update_uname_utf8(struct archive_entry *entry, const char *name)
 void
 archive_entry_set_is_data_encrypted(struct archive_entry *entry, char is_encrypted)
 {
-    if (entry) {
-		if (is_encrypted) {
-			entry->encryption |= AE_ENCRYPTION_DATA;
-		} else {
-			entry->encryption &= ~AE_ENCRYPTION_DATA;
-		}
-    }
+	if (is_encrypted) {
+		entry->encryption |= AE_ENCRYPTION_DATA;
+	} else {
+		entry->encryption &= ~AE_ENCRYPTION_DATA;
+	}
 }
 
 void
 archive_entry_set_is_metadata_encrypted(struct archive_entry *entry, char is_encrypted)
 {
-	if (entry) {
-		if (is_encrypted) {
-			entry->encryption |= AE_ENCRYPTION_METADATA;
-		} else {
-			entry->encryption &= ~AE_ENCRYPTION_METADATA;
-		}
-    }
+	if (is_encrypted) {
+		entry->encryption |= AE_ENCRYPTION_METADATA;
+	} else {
+		entry->encryption &= ~AE_ENCRYPTION_METADATA;
+	}
 }
 
 int