]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
Fix more uses of EXT2_IOC_[GS]ETFLAGS 19/head
authorAndreas Schwab <schwab@linux-m68k.org>
Wed, 29 Aug 2012 13:41:51 +0000 (15:41 +0200)
committerAndreas Schwab <schwab@linux-m68k.org>
Wed, 29 Aug 2012 13:43:45 +0000 (15:43 +0200)
libarchive/archive_read_disk_posix.c
libarchive/archive_write_disk_posix.c

index 698600e9b1518b09826fc4c07be81218259f80ca..652deb9ec4497168a8f41d119ee685f4d2d15201 100644 (file)
@@ -984,7 +984,7 @@ next_entry(struct archive_read_disk *a, struct tree *t,
 #elif defined(EXT2_IOC_GETFLAGS) && defined(EXT2_NODUMP_FL) &&\
       defined(HAVE_WORKING_EXT2_IOC_GETFLAGS)
                if (S_ISREG(st->st_mode) || S_ISDIR(st->st_mode)) {
-                       unsigned long stflags;
+                       int stflags;
 
                        t->entry_fd = open_on_current_dir(t,
                            tree_current_access_path(t), O_RDONLY | O_NONBLOCK);
index 3488b44dfe17da1239cc17246c35bc00a2aa7884..58c9ce8156ff9528d68fbba49239d522947dbe06 100644 (file)
@@ -2398,8 +2398,8 @@ set_fflags_platform(struct archive_write_disk *a, int fd, const char *name,
 {
        int              ret;
        int              myfd = fd;
-       unsigned long newflags, oldflags;
-       unsigned long sf_mask = 0;
+       int newflags, oldflags;
+       int sf_mask = 0;
 
        if (set == 0  && clear == 0)
                return (ARCHIVE_OK);