cvs commit: ALFS/nALFS/src/handlers remove.c

kpfleming at linuxfromscratch.org kpfleming at linuxfromscratch.org
Mon Mar 8 09:25:31 PST 2004


kpfleming    04/03/08 10:25:31

  Modified:    nALFS/src/handlers remove.c
  Log:
  restructure code to eliminate compile warning when syntax 3.2 is not compiled
  
  Revision  Changes    Path
  1.26      +15 -11    ALFS/nALFS/src/handlers/remove.c
  
  Index: remove.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/remove.c,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- remove.c	2 Mar 2004 06:54:11 -0000	1.25
  +++ remove.c	8 Mar 2004 17:25:30 -0000	1.26
  @@ -150,6 +150,8 @@
   	return 0;
   }
   
  +#if HANDLER_SYNTAX_2_0 || HANDLER_SYNTAX_3_0 || HANDLER_SYNTAX_3_1
  +
   static int remove_valid_data(const element_s * const element)
   {
   	struct remove_data *data = (struct remove_data *) element->handler_data;
  @@ -162,17 +164,7 @@
   	return 1;
   }
   
  -static int remove_valid_data_v3_2(const element_s * const element)
  -{
  -	struct remove_data *data = (struct remove_data *) element->handler_data;
  -
  -	if (!data->file_count) {
  -		Nprint_err("<%s>: <file> must be specified.", element->handler->name);
  -		return 0;
  -	}
  -
  -	return 1;
  -}
  +#endif /* HANDLER_SYNTAX_2_0 || HANDLER_SYNTAX_3_0 || HANDLER_SYNTAX_3_1 */
   
   #if HANDLER_SYNTAX_2_0
   
  @@ -255,6 +247,18 @@
       	}
   
   	return status;
  +}
  +
  +static int remove_valid_data_v3_2(const element_s * const element)
  +{
  +	struct remove_data *data = (struct remove_data *) element->handler_data;
  +
  +	if (!data->file_count) {
  +		Nprint_err("<%s>: <file> must be specified.", element->handler->name);
  +		return 0;
  +	}
  +
  +	return 1;
   }
   
   #endif
  
  
  



More information about the alfs-log mailing list