From owner-p4-projects@FreeBSD.ORG  Mon Jul 28 07:13:10 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F30241065672; Mon, 28 Jul 2008 07:13:09 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B2EBB1065670
	for <perforce@FreeBSD.org>; Mon, 28 Jul 2008 07:13:09 +0000 (UTC)
	(envelope-from strauss@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A558D8FC20
	for <perforce@FreeBSD.org>; Mon, 28 Jul 2008 07:13:09 +0000 (UTC)
	(envelope-from strauss@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m6S7D90C056724
	for <perforce@FreeBSD.org>; Mon, 28 Jul 2008 07:13:09 GMT
	(envelope-from strauss@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m6S7D9bu056722
	for perforce@freebsd.org; Mon, 28 Jul 2008 07:13:09 GMT
	(envelope-from strauss@FreeBSD.org)
Date: Mon, 28 Jul 2008 07:13:09 GMT
Message-Id: <200807280713.m6S7D9bu056722@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	strauss@FreeBSD.org using -f
From: Anselm Strauss <strauss@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 146092 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Jul 2008 07:13:10 -0000

http://perforce.freebsd.org/chv.cgi?CH=146092

Change 146092 by strauss@strauss_marvelman on 2008/07/28 07:12:22

	Cleaner code for archive freeing (Tim)

Affected files ...

.. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_write_set_format_zip.c#20 edit

Differences ...

==== //depot/projects/soc2008/strauss_libarchive/libarchive/archive_write_set_format_zip.c#20 (text+ko) ====

@@ -329,15 +329,14 @@
 archive_write_zip_destroy(struct archive_write *a)
 {	
 	struct zip *zip;
-	struct zip_file_header_link *l1, *l2;
+	struct zip_file_header_link *l;
 	
 	zip = a->format_data;
-	l1 = l2 = zip->central_directory;
-	while (l2 != NULL) {
-		l2 = l1->next;
-		free(l1->entry);
-		free(l1);
-		l1 = l2;
+	while (zip->central_directory != NULL) {
+	   l = zip->central_directory;
+	   zip->central_directory = l->next;
+	   archive_entry_free(l->entry);
+	   free(l);
 	}
 	free(zip);
 	a->format_data = NULL;