Browse Source

Fix minor type confusion

* src/tar.c (decode_options): Don’t assign ‘false’ to a pointer.
Paul Eggert 2 years ago
parent
commit
131ceea7a5
1 changed files with 15 additions and 15 deletions
  1. 15 15
      src/tar.c

+ 15 - 15
src/tar.c

@@ -392,36 +392,36 @@ enum
   {
     GRH_COMMAND,
     GRID_COMMAND,     /* Main operation mode */
-    
+
     GRH_MODIFIER,
     GRID_MODIFIER,    /* Operation modifiers */
 
     GRID_FILE_NAME,
-    
+
     GRH_OVERWRITE,
     GRID_OVERWRITE,   /* Overwrite control options */
-    
+
     GRH_OUTPUT,
     GRID_OUTPUT,      /* Output stream selection */
-    
+
     GRH_FATTR,
     GRID_FATTR,       /* File attributes (ownership and mode) */
-    
+
     GRH_XATTR,
     GRID_XATTR,       /* Extended file attributes */
-    
+
     GRH_DEVICE,
     GRID_DEVICE,      /* Device selection */
-    
+
     GRH_BLOCKING,
     GRID_BLOCKING,    /* Block and record length */
-    
+
     GRH_FORMAT,
     GRID_FORMAT,      /* Archive format options */
     GRDOC_FORMAT,
 
     GRID_FORMAT_OPT,
-    
+
     GRH_COMPRESS,
     GRID_COMPRESS,    /* Compression options */
 
@@ -1354,12 +1354,12 @@ parse_opt (int key, char *arg, struct argp_state *state)
       if (state->root_argp->children)
 	{
 	  int i;
-	
+
 	  for (i = 0; state->root_argp->children[i].argp; i++)
 	    state->child_inputs[i] = state->input;
 	}
       break;
-      
+
     case ARGP_KEY_ARG:
       /* File name or non-parsed option, because of ARGP_IN_ORDER */
       name_add_name (arg);
@@ -1751,7 +1751,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
     case WARNING_OPTION:
       set_warning_option (arg);
       break;
-      
+
     case 'x':
       set_subcommand_option (EXTRACT_SUBCOMMAND);
       break;
@@ -2231,7 +2231,7 @@ parse_default_options (struct tar_args *args)
   struct wordsplit ws;
   struct option_locus loc = { OPTS_ENVIRON, "TAR_OPTIONS", 0, 0 };
   struct option_locus *save_loc_ptr;
-  
+
   if (!opts)
     return;
 
@@ -2252,7 +2252,7 @@ parse_default_options (struct tar_args *args)
 	abort (); /* shouldn't happen */
       args->loc = save_loc_ptr;
       if (name_more_files ())
-	USAGE_ERROR ((0, 0, _("non-option arguments in %s"), loc.name));     
+	USAGE_ERROR ((0, 0, _("non-option arguments in %s"), loc.name));
       /* Don't free consumed words */
       ws.ws_wordc = 0;
     }
@@ -2632,7 +2632,7 @@ decode_options (int argc, char **argv)
       if (optloc_eq (preserve_order_loc, listed_incremental_loc))
 	option_conflict_error ("--preserve-order", "--listed-incremental");
       else if (preserve_order_loc->source == OPTS_COMMAND_LINE)
-	listed_incremental_option = false;
+	listed_incremental_option = NULL;
       else
 	same_order_option = false;
     }