svn commit: r191578 - head/lib/libarchive

[Tim Kientzle]

Author: kientzle
Date: Mon Apr 27 18:33:08 2009
New Revision: 191578
URL: http://svn.freebsd.org/changeset/base/191578

Log:
  Merge r1052,r1055 from libarchive.googlecode.com:
  Clear the error flag on entry to a few more API functions.

Modified:
  head/lib/libarchive/archive_read_open_fd.c
  head/lib/libarchive/archive_read_open_file.c
  head/lib/libarchive/archive_read_open_filename.c
  head/lib/libarchive/archive_read_support_compression_xz.c

Modified: head/lib/libarchive/archive_read_open_fd.c
==============================================================================
--- head/lib/libarchive/archive_read_open_fd.c  Mon Apr 27 18:29:59 2009        
(r191577)
+++ head/lib/libarchive/archive_read_open_fd.c  Mon Apr 27 18:33:08 2009        
(r191578)
@@ -66,6 +66,7 @@ archive_read_open_fd(struct archive *a, 
        struct read_fd_data *mine;
        void *b;
 
+       archive_clear_error(a);
        if (fstat(fd, &st) != 0) {
                archive_set_error(a, errno, "Can't stat fd %d", fd);
                return (ARCHIVE_FATAL);

Modified: head/lib/libarchive/archive_read_open_file.c
==============================================================================
--- head/lib/libarchive/archive_read_open_file.c        Mon Apr 27 18:29:59 
2009        (r191577)
+++ head/lib/libarchive/archive_read_open_file.c        Mon Apr 27 18:33:08 
2009        (r191578)
@@ -70,6 +70,7 @@ archive_read_open_FILE(struct archive *a
        size_t block_size = 128 * 1024;
        void *b;
 
+       archive_clear_error(a);
        mine = (struct read_FILE_data *)malloc(sizeof(*mine));
        b = malloc(block_size);
        if (mine == NULL || b == NULL) {

Modified: head/lib/libarchive/archive_read_open_filename.c
==============================================================================
--- head/lib/libarchive/archive_read_open_filename.c    Mon Apr 27 18:29:59 
2009        (r191577)
+++ head/lib/libarchive/archive_read_open_filename.c    Mon Apr 27 18:33:08 
2009        (r191578)
@@ -84,6 +84,7 @@ archive_read_open_filename(struct archiv
        void *b;
        int fd;
 
+       archive_clear_error(a);
        if (filename == NULL || filename[0] == '\0')
                return (archive_read_open_fd(a, 0, block_size));
 

Modified: head/lib/libarchive/archive_read_support_compression_xz.c
==============================================================================
--- head/lib/libarchive/archive_read_support_compression_xz.c   Mon Apr 27 
18:29:59 2009        (r191577)
+++ head/lib/libarchive/archive_read_support_compression_xz.c   Mon Apr 27 
18:33:08 2009        (r191578)
@@ -100,6 +100,7 @@ archive_read_support_compression_xz(stru
        struct archive_read *a = (struct archive_read *)_a;
        struct archive_read_filter_bidder *bidder = 
__archive_read_get_bidder(a);
 
+       archive_clear_error(_a);
        if (bidder == NULL)
                return (ARCHIVE_FATAL);
 
@@ -123,6 +124,7 @@ archive_read_support_compression_lzma(st
        struct archive_read *a = (struct archive_read *)_a;
        struct archive_read_filter_bidder *bidder = 
__archive_read_get_bidder(a);
 
+       archive_clear_error(_a);
        if (bidder == NULL)
                return (ARCHIVE_FATAL);
 
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"