|
@@ -897,12 +897,12 @@ static char const * const backup_file_table[] = {
|
|
|
};
|
|
|
|
|
|
static void
|
|
|
-add_exclude_array (char const * const * fv, int options)
|
|
|
+add_exclude_array (char const * const * fv, int opts)
|
|
|
{
|
|
|
int i;
|
|
|
|
|
|
for (i = 0; fv[i]; i++)
|
|
|
- add_exclude (excluded, fv[i], options);
|
|
|
+ add_exclude (excluded, fv[i], opts);
|
|
|
}
|
|
|
|
|
|
|
|
@@ -1152,16 +1152,18 @@ add_file_id (const char *filename)
|
|
|
|
|
|
/* Default density numbers for [0-9][lmh] device specifications */
|
|
|
|
|
|
-#ifndef LOW_DENSITY_NUM
|
|
|
-# define LOW_DENSITY_NUM 0
|
|
|
-#endif
|
|
|
+#if defined DEVICE_PREFIX && !defined DENSITY_LETTER
|
|
|
+# ifndef LOW_DENSITY_NUM
|
|
|
+# define LOW_DENSITY_NUM 0
|
|
|
+# endif
|
|
|
|
|
|
-#ifndef MID_DENSITY_NUM
|
|
|
-# define MID_DENSITY_NUM 8
|
|
|
-#endif
|
|
|
+# ifndef MID_DENSITY_NUM
|
|
|
+# define MID_DENSITY_NUM 8
|
|
|
+# endif
|
|
|
|
|
|
-#ifndef HIGH_DENSITY_NUM
|
|
|
-# define HIGH_DENSITY_NUM 16
|
|
|
+# ifndef HIGH_DENSITY_NUM
|
|
|
+# define HIGH_DENSITY_NUM 16
|
|
|
+# endif
|
|
|
#endif
|
|
|
|
|
|
static void
|
|
@@ -1375,7 +1377,6 @@ expand_pax_option (struct tar_args *targs, const char *arg)
|
|
|
static uintmax_t
|
|
|
parse_owner_group (char *arg, uintmax_t field_max, char const **name_option)
|
|
|
{
|
|
|
- strtol_error err;
|
|
|
uintmax_t u = UINTMAX_MAX;
|
|
|
char *end;
|
|
|
char const *name = 0;
|