X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Ftar;a=blobdiff_plain;f=src%2Fincremen.c;h=884d2fa2865831ad3a8ffec73aa617872324fa33;hp=f6b311ef4b2c783a5bf870d5311d4077d0269238;hb=45ccda119355a1087450039a250359c1d0de0d08;hpb=d28eee6b4f16d0fb847ee57771a42062259405b8 diff --git a/src/incremen.c b/src/incremen.c index f6b311e..884d2fa 100644 --- a/src/incremen.c +++ b/src/incremen.c @@ -1,6 +1,6 @@ /* GNU dump extensions to tar. - Copyright 1988, 1992-1994, 1996-1997, 1999-2001, 2003-2009, 2013 + Copyright 1988, 1992-1994, 1996-1997, 1999-2001, 2003-2009, 2013-2014 Free Software Foundation, Inc. This file is part of GNU tar. @@ -759,7 +759,7 @@ scan_directory (struct tar_stat_info *st) entry = dumpdir_next (itr)) { char *full_name = namebuf_name (nbuf, entry + 1); - + if (*entry == 'I') /* Ignored entry */ *entry = 'N'; else if (excluded_name (full_name)) @@ -792,7 +792,7 @@ scan_directory (struct tar_stat_info *st) diag = stat_diag; } } - + if (diag) { file_removed_diag (full_name, false, diag); @@ -806,7 +806,7 @@ scan_directory (struct tar_stat_info *st) else if (directory->children == ALL_CHILDREN) pd_flag |= PD_FORCE_CHILDREN | ALL_CHILDREN; *entry = 'D'; - + stsub.parent = st; procdir (full_name, &stsub, pd_flag, entry); restore_parent_fd (&stsub); @@ -823,7 +823,7 @@ scan_directory (struct tar_stat_info *st) *entry = 'N'; else *entry = 'Y'; - + tar_stat_destroy (&stsub); } } @@ -832,7 +832,7 @@ scan_directory (struct tar_stat_info *st) else if (directory->tagfile) maketagdumpdir (directory); } - + namebuf_free (nbuf); free (dirp); @@ -1296,8 +1296,8 @@ void show_snapshot_field_ranges (void) { struct field_range const *p; - char minbuf[max (SYSINT_BUFSIZE, INT_BUFSIZE_BOUND (intmax_t))]; - char maxbuf[max (SYSINT_BUFSIZE, INT_BUFSIZE_BOUND (uintmax_t))]; + char minbuf[SYSINT_BUFSIZE]; + char maxbuf[SYSINT_BUFSIZE]; printf("This tar's snapshot file field ranges are\n"); printf (" (%-15s => [ %s, %s ]):\n\n", "field name", "min", "max"); @@ -1406,7 +1406,7 @@ write_directory_file_entry (void *entry, void *data) if (DIR_IS_FOUND (directory)) { - char buf[max (SYSINT_BUFSIZE, INT_BUFSIZE_BOUND (intmax_t))]; + char buf[SYSINT_BUFSIZE]; char const *s; s = DIR_IS_NFS (directory) ? "1" : "0";