From owner-p4-projects@FreeBSD.ORG Sat May 15 04:39:43 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 83A181065672; Sat, 15 May 2010 04:39:43 +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 43DD5106566B for ; Sat, 15 May 2010 04:39:43 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 174D28FC15 for ; Sat, 15 May 2010 04:39:43 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4F4dg2f023209 for ; Sat, 15 May 2010 04:39:42 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4F4dgl5023207 for perforce@freebsd.org; Sat, 15 May 2010 04:39:42 GMT (envelope-from gcooper@FreeBSD.org) Date: Sat, 15 May 2010 04:39:42 GMT Message-Id: <201005150439.o4F4dgl5023207@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178284 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 May 2010 04:39:43 -0000 http://p4web.freebsd.org/@@178284?ac=10 Change 178284 by gcooper@starr-bastion on 2010/05/15 04:38:48 Abbreviate unpack API names. Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/file.c#9 edit .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/pkg.h#4 edit Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/file.c#9 (text+ko) ==== @@ -345,7 +345,7 @@ /* * Unpack a single file, denoted by file, to a buffer; this call uses - * unpack_file_to_fd to first open the file, and once that has been completed + * unpack_to_fd to first open the file, and once that has been completed * it opens the file and proceeds to read it into the buffer -- either * specified by buffer if buffer is not NULL, or attempts to allocate memory * which will need to be freed by the user at a later date. @@ -354,14 +354,14 @@ * returns NULL on failure. */ char* -unpack_file_to_buffer(char *buffer, const char *pkg, const char *file) +unpack_to_buffer(char *buffer, const char *pkg, const char *file) { FILE *fd = NULL; char *buf = buffer; struct stat sb; - if ((fd = unpack_file_to_fd(pkg, file)) != NULL) { + if ((fd = unpack_to_fd(pkg, file)) != NULL) { if (fstat(fileno(fd), &sb) == 0) { @@ -416,7 +416,7 @@ * Return -1 on failure, a value greater than 0 on success. */ FILE* -unpack_file_to_fd(const char *pkg, const char *file) +unpack_to_fd(const char *pkg, const char *file) { struct archive *archive; struct archive_entry *archive_entry; ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/pkg.h#4 (text+ko) ==== @@ -189,8 +189,9 @@ void copy_hierarchy(const char *, const char *, Boolean); int delete_hierarchy(const char *, Boolean, Boolean); int unpack(const char *, const char *); -char* unpack_file_to_buffer(char *, const char *, const char *); -FILE* unpack_file_to_fd(const char *, const char *); +char* unpack_to_buffer(struct archive *archive, const char *, + const char *); +FILE* unpack_to_fd(const char *, const char *); void format_cmd(char *, int, const char *, const char *, const char *); /* Msg */