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

kpfleming at linuxfromscratch.org kpfleming at linuxfromscratch.org
Mon Mar 1 21:20:20 PST 2004


kpfleming    04/03/01 22:20:20

  Modified:    nALFS/src/handlers copy.c
  Log:
  use consistent error message syntax
  
  Revision  Changes    Path
  1.25      +7 -7      ALFS/nALFS/src/handlers/copy.c
  
  Index: copy.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/handlers/copy.c,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- copy.c	2 Mar 2004 05:17:53 -0000	1.24
  +++ copy.c	2 Mar 2004 05:20:20 -0000	1.25
  @@ -106,7 +106,7 @@
   	switch (attr->private) {
   	case COPY_BASE:
   		if (data->base) {
  -			Nprint_err("<copy>: cannot specify \"base\" more than once.");
  +			Nprint_err("<%s>: cannot specify \"base\" more than once.", element->handler->name);
   			return 1;
   		}
   		data->base = xstrdup(value);
  @@ -126,7 +126,7 @@
   	switch (param->private) {
   	case COPY_BASE:
   		if (data->base) {
  -			Nprint_err("<copy>: cannot specify <base> more than once.");
  +			Nprint_err("<%s>: cannot specify <base> more than once.", element->handler->name);
   			return 1;
   		}
   		data->base = xstrdup(value);
  @@ -153,7 +153,7 @@
   			option_found++;
   		}
   		if (!option_found) {
  -			Nprint_err("<copy>: invalid options in (%s) ignored", value);
  +			Nprint_err("<%s>: invalid options in (%s) ignored", element->handler->name, value);
   			return 1;
   		} else {
   			return 0;
  @@ -179,7 +179,7 @@
   			data->no_dereference = 1;
   			return 0;
   		}
  -		Nprint_err("<copy>: invalid option (%s) ignored", value);
  +		Nprint_err("<%s>: invalid option (%s) ignored", element->handler->name, value);
   		return 1;
   	case COPY_SOURCE:
   		data->source_count++;
  @@ -192,7 +192,7 @@
   		return 0;
   	case COPY_DESTINATION:
   		if (data->destination) {
  -			Nprint_err("<copy>: cannot specify <destination> more than once.");
  +			Nprint_err("<%s>: cannot specify <destination> more than once.", element->handler->name);
   			return 1;
   		}
   		data->destination = xstrdup(value);
  @@ -207,12 +207,12 @@
   	struct copy_data *data = (struct copy_data *) element->handler_data;
   
   	if (data->source_count == 0) {
  -		Nprint_err("<copy>: <source> must be specified.");
  +		Nprint_err("<%s>: <source> must be specified.", element->handler->name);
   		return 0;
   	}
   
   	if (!data->destination) {
  -		Nprint_err("<copy>: <destination> must be specified.");
  +		Nprint_err("<%s>: <destination> must be specified.", element->handler->name);
   		return 0;
   	}
   
  
  
  



More information about the alfs-log mailing list