cvs commit: ALFS/nALFS/src init.c nalfs.c options.c

neven at linuxfromscratch.org neven at linuxfromscratch.org
Thu Nov 6 19:55:57 PST 2003


neven       03/11/06 20:55:57

  Modified:    nALFS/src init.c nalfs.c options.c
  Log:
  Removed \n from nprint_init calls, to be consistent with other nprint
  functions.
  
  Revision  Changes    Path
  1.13      +8 -9      ALFS/nALFS/src/init.c
  
  Index: init.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/init.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- init.c	6 Nov 2003 18:30:29 -0000	1.12
  +++ init.c	7 Nov 2003 03:55:56 -0000	1.13
  @@ -114,7 +114,7 @@
   			break;
   
   		case OPTION_UNKNOWN:
  -			Nprint_err("Option \"%s\" is unknown.\n", opt);
  +			Nprint_err("Option \"%s\" is unknown.", opt);
   			ret = -1;
   			break;
   
  @@ -149,8 +149,7 @@
   		} else if (ch == '\\') {
   			if (!quote) {
   				Nprint_warn(
  -					"Escape character outside of quotes? "
  -					"What for?\n");
  +				"Escape character found outside of quotes.");
   				return -1;
   			}
   			buffer[pos++] = **s;
  @@ -164,7 +163,7 @@
   	buffer[pos] = '\0';
   
   	if (pos == 0) {
  -		Nprint_warn("Empty token.\n");
  +		Nprint_warn("Empty token.");
   		return -1;
   	}
   
  @@ -203,7 +202,7 @@
   		return handle_set_line(opt, val);
   	}
   
  -	Nprint_err("Unknown command (%s).\n", command);
  +	Nprint_err("Unknown command (%s).", command);
   
   	return -1;
   }
  @@ -236,12 +235,12 @@
   			while ((c = getc(fp)) != EOF && c != '\n')
   				/* Skip in circle. */;
   
  -			Nprint_err("File %s, line %d too long, won't read it.\n",
  +			Nprint_err("File %s, line %d too long, won't read it.",
   				   rcfile, line_num);
   		}
   
   		if (parse_rc_line(line) != 0) {
  -			Nprint_err("File %s, error at line %d: %s\n",
  +			Nprint_err("File %s, error at line %d: %s",
   				   rcfile, line_num, line);
   		}
   	}
  @@ -274,7 +273,7 @@
   	home_dir = get_home_directory();
   
   	if (Empty_string(home_dir)) {
  -		Nprint_warn("Can't find your home directory.\n");
  +		Nprint_warn("Can't find your home directory.");
   		return;
   	}
   
  @@ -506,7 +505,7 @@
   
   	/* Check for specified profiles. */
   	if (optind >= *argc) {
  -		Nprint_err("No profiles specified.\n");
  +		Nprint_err("No profiles specified.");
   		print_usage_and_exit();
   	}
   }
  
  
  
  1.39      +2 -1      ALFS/nALFS/src/nalfs.c
  
  Index: nalfs.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/nalfs.c,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- nalfs.c	6 Nov 2003 18:18:11 -0000	1.38
  +++ nalfs.c	7 Nov 2003 03:55:56 -0000	1.39
  @@ -4652,7 +4652,8 @@
   	}
   
   	vfprintf(console, format, ap);
  -	fflush(console);
  +
  +	fputc('\n', console);
   
   	va_end(ap);
   }
  
  
  
  1.22      +2 -2      ALFS/nALFS/src/options.c
  
  Index: options.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/options.c,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- options.c	6 Nov 2003 18:18:11 -0000	1.21
  +++ options.c	7 Nov 2003 03:55:56 -0000	1.22
  @@ -211,10 +211,10 @@
   
   	va_start(ap, format);
   	if (vsnprintf(buffer, sizeof buffer, format, ap) > 0)
  -		Nprint_err("Option \"%s\" invalid value: %s\n",
  +		Nprint_err("Option \"%s\" invalid value: %s",
   			   option->name, buffer);
   	else
  -		Nprint_err("Option \"%s\" invalid value\n", option->name);
  +		Nprint_err("Option \"%s\" invalid value.", option->name);
   	va_end(ap);
   }
   
  
  
  



More information about the alfs-log mailing list