cvs commit: ALFS/nALFS/src/handlers alfs.c copy.c digest.c download.c stage.c unpack.c

kpfleming at linuxfromscratch.org kpfleming at linuxfromscratch.org
Sat Feb 28 19:30:01 PST 2004


kpfleming    04/02/28 20:30:01

  Modified:    nALFS/src handlers.h libXML-tree.c
               nALFS/src/handlers alfs.c copy.c digest.c download.c stage.c
                        unpack.c
  Log:
  invert sense of handler data/child tests to make more sense :-)
  
  Revision  Changes    Path
  1.24      +5 -5      ALFS/nALFS/src/handlers.h
  
  Index: handlers.h
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers.h,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- handlers.h	28 Feb 2004 05:55:43 -0000	1.23
  +++ handlers.h	29 Feb 2004 03:30:00 -0000	1.24
  @@ -79,9 +79,9 @@
   				 const char * const value);
   typedef int (*handler_content)(const element_s * const element,
   			       const char * const content);
  -typedef int (*handler_invalid_data)(const element_s * const element);
  -typedef int (*handler_invalid_child)(const element_s * const element,
  -				     const element_s * const child);
  +typedef int (*handler_valid_data)(const element_s * const element);
  +typedef int (*handler_valid_child)(const element_s * const element,
  +				   const element_s * const child);
   
   typedef struct handler_info_s {
   	const char *name;		/* Name of the element it handles. */
  @@ -114,8 +114,8 @@
   	*/
   	handler_setup setup;	/* Function to setup handler private data. */
   	handler_free free;
  -	handler_invalid_data invalid_data; /* Validate private data. */
  -	handler_invalid_child invalid_child; /* Validate potential child. */
  +	handler_valid_data valid_data; /* Validate private data. */
  +	handler_valid_child valid_child; /* Validate potential child. */
   	handler_attribute attribute;
   	handler_parameter parameter;
   	handler_content content;
  
  
  
  1.15      +8 -8      ALFS/nALFS/src/libXML-tree.c
  
  Index: libXML-tree.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/libXML-tree.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- libXML-tree.c	23 Feb 2004 21:35:41 -0000	1.14
  +++ libXML-tree.c	29 Feb 2004 03:30:00 -0000	1.15
  @@ -268,20 +268,20 @@
   		}
   
   		/* If the handler wants to validate its private data */
  -		if (handler->invalid_data) {
  -			result = handler->invalid_data(element);
  -			if (result)
  -				return result;
  +		if (handler->valid_data) {
  +			result = handler->valid_data(element);
  +			if (!result)
  +				return -1;
   		}
   
   	}
   
   	/* If the element's parent wants to validate its children */
  -	if (parent->invalid_child) {
  -		result = parent->invalid_child(element->parent, element);
  -		if (result) {
  +	if (parent->valid_child) {
  +		result = parent->valid_child(element->parent, element);
  +		if (!result) {
   			Nprint_warn("<%s>: <%s> not valid here.", parent->name, handler->name);
  -			return result;
  +			return -1;
   		}
   	}
   
  
  
  
  1.21      +11 -11    ALFS/nALFS/src/handlers/alfs.c
  
  Index: alfs.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/alfs.c,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- alfs.c	29 Feb 2004 03:13:47 -0000	1.20
  +++ alfs.c	29 Feb 2004 03:30:00 -0000	1.21
  @@ -89,16 +89,16 @@
   	}
   }
   
  -static int alfs_invalid_child(const element_s * const element,
  -			      const element_s * const child)
  +static int alfs_valid_child(const element_s * const element,
  +			    const element_s * const child)
   {
   	(void) element;
   
  -	return !(child->handler->type & (HTYPE_NORMAL |
  -					 HTYPE_COMMENT |
  -					 HTYPE_TEXTDUMP |
  -					 HTYPE_PACKAGE |
  -					 HTYPE_EXECUTE));
  +	return child->handler->type & (HTYPE_NORMAL |
  +				       HTYPE_COMMENT |
  +				       HTYPE_TEXTDUMP |
  +				       HTYPE_PACKAGE |
  +				       HTYPE_EXECUTE);
   }
   
   static int alfs_main(const element_s * const el)
  @@ -127,7 +127,7 @@
   		.free = alfs_free,
   		.attributes = alfs_attributes,
   		.attribute = alfs_attribute,
  -		.invalid_child = alfs_invalid_child,
  +		.valid_child = alfs_valid_child,
   	},
   #endif
   #if HANDLER_SYNTAX_3_0
  @@ -141,7 +141,7 @@
   		.free = alfs_free,
   		.attributes = alfs_attributes,
   		.attribute = alfs_attribute,
  -		.invalid_child = alfs_invalid_child,
  +		.valid_child = alfs_valid_child,
   	},
   #endif
   #if HANDLER_SYNTAX_3_1
  @@ -155,7 +155,7 @@
   		.free = alfs_free,
   		.attributes = alfs_attributes,
   		.attribute = alfs_attribute,
  -		.invalid_child = alfs_invalid_child,
  +		.valid_child = alfs_valid_child,
   	},
   #endif
   #if HANDLER_SYNTAX_3_2
  @@ -169,7 +169,7 @@
   		.free = alfs_free,
   		.attributes = alfs_attributes,
   		.attribute = alfs_attribute,
  -		.invalid_child = alfs_invalid_child,
  +		.valid_child = alfs_valid_child,
   	},
   #endif
   	{
  
  
  
  1.22      +8 -8      ALFS/nALFS/src/handlers/copy.c
  
  Index: copy.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/copy.c,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- copy.c	29 Feb 2004 03:16:55 -0000	1.21
  +++ copy.c	29 Feb 2004 03:30:00 -0000	1.22
  @@ -194,21 +194,21 @@
   	}
   }
   
  -static int copy_invalid_data(const element_s * const element)
  +static int copy_valid_data(const element_s * const element)
   {
   	struct copy_data *data = (struct copy_data *) element->handler_data;
   
   	if (data->source_count == 0) {
   		Nprint_err("<copy>: <source> must be specified.");
  -		return 1;
  +		return 0;
   	}
   
   	if (!data->destination) {
   		Nprint_err("<copy>: <destination> must be specified.");
  -		return 1;
  +		return 0;
   	}
   
  -	return 0;
  +	return 1;
   }
   
   #if HANDLER_SYNTAX_2_0
  @@ -362,7 +362,7 @@
   		.setup = copy_setup,
   		.free = copy_free,
   		.parameter = copy_parameter,
  -		.invalid_data = copy_invalid_data,
  +		.valid_data = copy_valid_data,
   	},
   #endif
   #if HANDLER_SYNTAX_3_0
  @@ -379,7 +379,7 @@
   		.free = copy_free,
   		.parameter = copy_parameter,
   		.attribute = copy_attribute,
  -		.invalid_data = copy_invalid_data,
  +		.valid_data = copy_valid_data,
   	},
   #endif
   #if HANDLER_SYNTAX_3_1
  @@ -396,7 +396,7 @@
   		.free = copy_free,
   		.parameter = copy_parameter,
   		.attribute = copy_attribute,
  -		.invalid_data = copy_invalid_data,
  +		.valid_data = copy_valid_data,
   	},
   #endif
   #if HANDLER_SYNTAX_3_2
  @@ -414,7 +414,7 @@
   		.free = copy_free,
   		.parameter = copy_parameter,
   		.attribute = copy_attribute,
  -		.invalid_data = copy_invalid_data,
  +		.valid_data = copy_valid_data,
   	},
   #endif
   	{
  
  
  
  1.5       +6 -6      ALFS/nALFS/src/handlers/digest.c
  
  Index: digest.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/digest.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- digest.c	29 Feb 2004 03:13:47 -0000	1.4
  +++ digest.c	29 Feb 2004 03:30:00 -0000	1.5
  @@ -107,16 +107,16 @@
   	return 0;
   }
   
  -static int digest_invalid_data(const element_s * const element)
  +static int digest_valid_data(const element_s * const element)
   {
   	struct digest_data *data = (struct digest_data *) element->handler_data;
   
   	if (!data->content) {
   		Nprint_err("<digest>: content cannot be empty.");
  -		return 1;
  +		return 0;
   	}
   
  -	return 0;
  +	return 1;
   }
   
   static char *digest_data(const element_s * const element,
  @@ -171,7 +171,7 @@
   		.content = digest_content,
   		.data = HDATA_COMMAND | HDATA_VERSION,
   		.alloc_data = digest_data,
  -		.invalid_data = digest_invalid_data,
  +		.valid_data = digest_valid_data,
   	},
   #endif
   #if HANDLER_SYNTAX_3_1
  @@ -188,7 +188,7 @@
   		.content = digest_content,
   		.data = HDATA_COMMAND | HDATA_VERSION,
   		.alloc_data = digest_data,
  -		.invalid_data = digest_invalid_data,
  +		.valid_data = digest_valid_data,
   	},
   #endif
   #if HANDLER_SYNTAX_3_2
  @@ -205,7 +205,7 @@
   		.content = digest_content,
   		.data = HDATA_COMMAND | HDATA_VERSION,
   		.alloc_data = digest_data,
  -		.invalid_data = digest_invalid_data,
  +		.valid_data = digest_valid_data,
   	},
   #endif
   	{
  
  
  
  1.23      +18 -18    ALFS/nALFS/src/handlers/download.c
  
  Index: download.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/download.c,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- download.c	29 Feb 2004 03:13:47 -0000	1.22
  +++ download.c	29 Feb 2004 03:30:00 -0000	1.23
  @@ -116,8 +116,8 @@
   }
   
   static int download_parameter(const element_s * const element,
  -			    const struct handler_parameter * const param,
  -			    const char * const value)
  +			      const struct handler_parameter * const param,
  +			      const char * const value)
   {
   	struct download_data *data = (struct download_data *) element->handler_data;
   
  @@ -150,24 +150,24 @@
   	}
   }
   
  -static int download_invalid_data(const element_s * const element)
  +static int download_valid_data(const element_s * const element)
   {
   	struct download_data *data = (struct download_data *) element->handler_data;
   
   	if (!data->file) {
   		Nprint_err("<download>: \"file\" must be specified.");
  -		return 1;
  +		return 0;
   	}
   
   	if (!data->destination) {
   		Nprint_err("<download>: \"destination\" must be specified.");
  -		return 1;
  +		return 0;
   	}
   
  -	return 0;
  +	return 1;
   }
   
  -static int download_invalid_child(const element_s * const element,
  +static int download_valid_child(const element_s * const element,
   				const element_s * const child)
   {
   	struct download_data *data = (struct download_data *) element->handler_data;
  @@ -175,14 +175,14 @@
   	if (child->handler->type & HTYPE_DIGEST) {
   		if (data->digest) {
   			Nprint_err("<download>: only one <digest> allowed.");
  -			return 1;
  +			return 0;
   		}
   
   		data->digest = child;
  -		return 0;
  +		return 1;
   	}
   
  -	return 1;
  +	return 0;
   }
   
   static int download_common(const element_s * const element)
  @@ -274,13 +274,13 @@
   	{ .name = NULL }
   };
   
  -static int download_invalid_data_v3_2(const element_s * const element)
  +static int download_valid_data_v3_2(const element_s * const element)
   {
   	struct download_data *data = (struct download_data *) element->handler_data;
   
   	if (!data->file) {
   		Nprint_err("<download>: \"file\" must be specified.");
  -		return 1;
  +		return 0;
   	}
   
   	if (!data->base) {
  @@ -288,13 +288,13 @@
   
   		if (!base) {
   			Nprint_err("<download>: \"base\" must be specified at or above this element.");
  -			return 1;
  +			return 0;
   		} else {
   			xfree(base);
   		}
   	}
   
  -	return 0;
  +	return 1;
   }
   
   static int download_main_v3_2(const element_s * const element)
  @@ -327,8 +327,8 @@
   		.setup = download_setup,
   		.free = download_free,
   		.parameter = download_parameter,
  -		.invalid_child = download_invalid_child,
  -		.invalid_data = download_invalid_data,
  +		.valid_child = download_valid_child,
  +		.valid_data = download_valid_data,
   	},
   #endif
   #if HANDLER_SYNTAX_3_2
  @@ -345,8 +345,8 @@
   		.setup = download_setup,
   		.free = download_free,
   		.parameter = download_parameter,
  -		.invalid_child = download_invalid_child,
  -		.invalid_data = download_invalid_data_v3_2,
  +		.valid_child = download_valid_child,
  +		.valid_data = download_valid_data_v3_2,
   		.attribute = download_attribute,
   	},
   #endif
  
  
  
  1.30      +43 -43    ALFS/nALFS/src/handlers/stage.c
  
  Index: stage.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/stage.c,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- stage.c	29 Feb 2004 03:13:47 -0000	1.29
  +++ stage.c	29 Feb 2004 03:30:00 -0000	1.30
  @@ -334,26 +334,26 @@
   	}
   }
   
  -static int stage_invalid_child(const element_s * const element,
  -			       const element_s * const child)
  +static int stage_valid_child(const element_s * const element,
  +			     const element_s * const child)
   {
   	struct stage_data *data = (struct stage_data *) element->handler_data;
   
   	if (child->handler->type & HTYPE_STAGEINFO) {
   		if (data->stageinfo) {
   			Nprint_err("<stage>: only one <stageinfo> allowed.");
  -			return 1;
  +			return 0;
   		}
   
   		data->stageinfo = child;
  -		return 0;
  +		return 1;
   	}
   
  -	return !(child->handler->type & (HTYPE_NORMAL |
  -					 HTYPE_COMMENT |
  -					 HTYPE_TEXTDUMP |
  -					 HTYPE_PACKAGE |
  -					 HTYPE_EXECUTE));
  +	return child->handler->type & (HTYPE_NORMAL |
  +				       HTYPE_COMMENT |
  +				       HTYPE_TEXTDUMP |
  +				       HTYPE_PACKAGE |
  +				       HTYPE_EXECUTE);
   }
   
   static int stage_main(const element_s * const element)
  @@ -546,16 +546,16 @@
   	}
   }
   
  -static int stageinfo_invalid_child(const element_s * const element,
  -				   const element_s * const child)
  +static int stageinfo_valid_child(const element_s * const element,
  +				 const element_s * const child)
   {
   	(void) element;
   
   	if (child->handler->main != environment_main) {
  -		return 1;
  +		return 0;
   	}
   
  -	return 0;
  +	return 1;
   }
   
   static int stageinfo_main(const element_s * const element)
  @@ -611,16 +611,16 @@
   
   /* <environment> handler */
   
  -static int environment_invalid_child(const element_s * const element,
  -				     const element_s * const child)
  +static int environment_valid_child(const element_s * const element,
  +				   const element_s * const child)
   {
   	(void) element;
   
   	if (child->handler->main != variable_main) {
  -		return 1;
  +		return 0;
   	}
   
  -	return 0;
  +	return 1;
   }
   
   static int environment_main(const element_s * const element)
  @@ -722,31 +722,31 @@
   	return 0;
   }
   
  -static int variable_invalid_data(const element_s * const element)
  +static int variable_valid_data(const element_s * const element)
   {
   	struct variable_data *data = (struct variable_data *) element->handler_data;
   
   	if (!data->name) {
   		Nprint_err("<variable>: \"name\" must be specified.");
  -		return 1;
  +		return 0;
   	}
   
   	if (!data->value &&
   	    ((data->mode == VAR_APPEND) || (data->mode == VAR_PREPEND))) {
   		Nprint_err("<variable>: content cannot be empty if mode is prepend or append.");
  -		return 1;
  +		return 0;
   	}
   
  -	return 0;
  +	return 1;
   }
   
  -static int variable_invalid_child(const element_s * const element,
  -				  const element_s * const child)
  +static int variable_valid_child(const element_s * const element,
  +				const element_s * const child)
   {
   	(void) element;
   	(void) child;
   
  -	return 1;
  +	return 0;
   }
   
   static int variable_main(const element_s * const element)
  @@ -787,7 +787,7 @@
   		.free = stage_free,
   		.attributes = stage_attributes,
   		.attribute = stage_attribute,
  -		.invalid_child = stage_invalid_child,
  +		.valid_child = stage_valid_child,
   	},
   	{
   		.name = "stageinfo",
  @@ -800,7 +800,7 @@
   		.free = stageinfo_free,
   		.parameters = stageinfo_parameters,
   		.parameter = stageinfo_parameter,
  -		.invalid_child = stageinfo_invalid_child,
  +		.valid_child = stageinfo_valid_child,
   	},
   	{
   		.name = "environment",
  @@ -808,7 +808,7 @@
   		.syntax_version = "3.0",
   		.type = HTYPE_NORMAL,
   		.main = environment_main,
  -		.invalid_child = environment_invalid_child,
  +		.valid_child = environment_valid_child,
   	},
   	{
   		.name = "variable",
  @@ -821,8 +821,8 @@
   		.attributes = variable_attributes,
   		.attribute = variable_attribute,
   		.content = variable_content,
  -		.invalid_data = variable_invalid_data,
  -		.invalid_child = variable_invalid_child,
  +		.valid_data = variable_valid_data,
  +		.valid_child = variable_valid_child,
   	},
   #endif
   #if HANDLER_SYNTAX_3_1
  @@ -838,7 +838,7 @@
   		.free = stage_free,
   		.attributes = stage_attributes,
   		.attribute = stage_attribute,
  -		.invalid_child = stage_invalid_child,
  +		.valid_child = stage_valid_child,
   	},
   	{
   		.name = "then",
  @@ -852,7 +852,7 @@
   		.free = stage_free,
   		.attributes = stage_attributes,
   		.attribute = stage_attribute,
  -		.invalid_child = stage_invalid_child,
  +		.valid_child = stage_valid_child,
   	},
   	{
   		.name = "else",
  @@ -866,7 +866,7 @@
   		.free = stage_free,
   		.attributes = stage_attributes,
   		.attribute = stage_attribute,
  -		.invalid_child = stage_invalid_child,
  +		.valid_child = stage_valid_child,
   	},
   	{
   		.name = "stageinfo",
  @@ -879,7 +879,7 @@
   		.free = stageinfo_free,
   		.parameters = stageinfo_parameters,
   		.parameter = stageinfo_parameter,
  -		.invalid_child = stageinfo_invalid_child,
  +		.valid_child = stageinfo_valid_child,
   	},
   	{
   		.name = "environment",
  @@ -887,7 +887,7 @@
   		.syntax_version = "3.1",
   		.type = HTYPE_NORMAL,
   		.main = environment_main,
  -		.invalid_child = environment_invalid_child,
  +		.valid_child = environment_valid_child,
   	},
   	{
   		.name = "variable",
  @@ -900,8 +900,8 @@
   		.attributes = variable_attributes,
   		.attribute = variable_attribute,
   		.content = variable_content,
  -		.invalid_data = variable_invalid_data,
  -		.invalid_child = variable_invalid_child,
  +		.valid_data = variable_valid_data,
  +		.valid_child = variable_valid_child,
   	},
   #endif
   #if HANDLER_SYNTAX_3_2
  @@ -917,7 +917,7 @@
   		.free = stage_free,
   		.attributes = stage_attributes,
   		.attribute = stage_attribute,
  -		.invalid_child = stage_invalid_child,
  +		.valid_child = stage_valid_child,
   	},
   	{
   		.name = "then",
  @@ -931,7 +931,7 @@
   		.free = stage_free,
   		.attributes = stage_attributes,
   		.attribute = stage_attribute,
  -		.invalid_child = stage_invalid_child,
  +		.valid_child = stage_valid_child,
   	},
   	{
   		.name = "else",
  @@ -945,7 +945,7 @@
   		.free = stage_free,
   		.attributes = stage_attributes,
   		.attribute = stage_attribute,
  -		.invalid_child = stage_invalid_child,
  +		.valid_child = stage_valid_child,
   	},
   	{
   		.name = "stageinfo",
  @@ -958,7 +958,7 @@
   		.alloc_data = stageinfo_data,
   		.parameters = stageinfo_parameters_3_2,
   		.parameter = stageinfo_parameter,
  -		.invalid_child = stageinfo_invalid_child,
  +		.valid_child = stageinfo_valid_child,
   	},
   	{
   		.name = "environment",
  @@ -966,7 +966,7 @@
   		.syntax_version = "3.2",
   		.type = HTYPE_NORMAL,
   		.main = environment_main,
  -		.invalid_child = environment_invalid_child,
  +		.valid_child = environment_valid_child,
   	},
   	{
   		.name = "variable",
  @@ -979,8 +979,8 @@
   		.attributes = variable_attributes,
   		.attribute = variable_attribute,
   		.content = variable_content,
  -		.invalid_data = variable_invalid_data,
  -		.invalid_child = variable_invalid_child,
  +		.valid_data = variable_valid_data,
  +		.valid_child = variable_valid_child,
   	},
   #endif
   	{
  
  
  
  1.31      +20 -20    ALFS/nALFS/src/handlers/unpack.c
  
  Index: unpack.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/unpack.c,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- unpack.c	29 Feb 2004 03:13:47 -0000	1.30
  +++ unpack.c	29 Feb 2004 03:30:00 -0000	1.31
  @@ -206,39 +206,39 @@
   	}
   }
   
  -static int unpack_invalid_data(const element_s * const element)
  +static int unpack_valid_data(const element_s * const element)
   {
   	struct unpack_data *data = (struct unpack_data *) element->handler_data;
   
   	if (!data->archive) {
   		Nprint_err("<unpack>: \"archive\" must be specified.");
  -		return 1;
  +		return 0;
   	}
   
   	if (!data->destination) {
   		Nprint_err("<unpack>: \"destination\" must be specified.");
  -		return 1;
  +		return 0;
   	}
   
  -	return 0;
  +	return 1;
   }
   
  -static int unpack_invalid_child(const element_s * const element,
  -				const element_s * const child)
  +static int unpack_valid_child(const element_s * const element,
  +			      const element_s * const child)
   {
   	struct unpack_data *data = (struct unpack_data *) element->handler_data;
   
   	if (child->handler->type & HTYPE_DIGEST) {
   		if (data->digest) {
   			Nprint_err("<unpack>: only one <digest> allowed.");
  -			return 1;
  +			return 0;
   		}
   
   		data->digest = child;
  -		return 0;
  +		return 1;
   	}
   
  -	return 1;
  +	return 0;
   }
   
   #if HANDLER_SYNTAX_2_0
  @@ -373,13 +373,13 @@
   	{ .name = NULL }
   };
   
  -static int unpack_invalid_data_v3_2(const element_s * const element)
  +static int unpack_valid_data_v3_2(const element_s * const element)
   {
   	struct unpack_data *data = (struct unpack_data *) element->handler_data;
   
   	if (!data->archive) {
   		Nprint_err("<unpack>: \"archive\" must be specified.");
  -		return 1;
  +		return 0;
   	}
   
   	if (!data->base) {
  @@ -387,13 +387,13 @@
   
   		if (!base) {
   			Nprint_err("<unpack>: \"base\" must be specified at or above this element.");
  -			return 1;
  +			return 0;
   		} else {
   			xfree(base);
   		}
   	}
   
  -	return 0;
  +	return 1;
   }
   
   static int unpack_main_ver3_2(const element_s * const element)
  @@ -426,7 +426,7 @@
   		.setup = unpack_setup,
   		.free = unpack_free,
   		.parameter = unpack_parameter,
  -		.invalid_data = unpack_invalid_data,
  +		.valid_data = unpack_valid_data,
   	},
   #endif
   #if HANDLER_SYNTAX_3_0
  @@ -441,8 +441,8 @@
   		.setup = unpack_setup,
   		.free = unpack_free,
   		.parameter = unpack_parameter,
  -		.invalid_data = unpack_invalid_data,
  -		.invalid_child = unpack_invalid_child,
  +		.valid_data = unpack_valid_data,
  +		.valid_child = unpack_valid_child,
   	},
   #endif
   #if HANDLER_SYNTAX_3_1
  @@ -457,8 +457,8 @@
   		.setup = unpack_setup,
   		.free = unpack_free,
   		.parameter = unpack_parameter,
  -		.invalid_data = unpack_invalid_data,
  -		.invalid_child = unpack_invalid_child,
  +		.valid_data = unpack_valid_data,
  +		.valid_child = unpack_valid_child,
   	},
   #endif
   #if HANDLER_SYNTAX_3_2
  @@ -476,8 +476,8 @@
   		.parameter = unpack_parameter,
   		.attribute = unpack_attribute,
   		.alternate_shell = 1,
  -		.invalid_data = unpack_invalid_data_v3_2,
  -		.invalid_child = unpack_invalid_child,
  +		.valid_data = unpack_valid_data_v3_2,
  +		.valid_child = unpack_valid_child,
   	},
   #endif
   	{
  
  
  



More information about the alfs-log mailing list