===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/less/optfunc.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -c -r1.12 -r1.13
*** src/usr.bin/less/optfunc.c	2015/11/07 18:07:44	1.12
--- src/usr.bin/less/optfunc.c	2015/11/09 16:39:13	1.13
***************
*** 66,72 ****
  	PARG parg;
  
  	if (secure) {
! 		error("log file support is not available", NULL_PARG);
  		return;
  	}
  	switch (type) {
--- 66,72 ----
  	PARG parg;
  
  	if (secure) {
! 		error("log file support is not available", NULL);
  		return;
  	}
  	switch (type) {
***************
*** 75,85 ****
  		break;
  	case TOGGLE:
  		if (ch_getflags() & CH_CANSEEK) {
! 			error("Input is not a pipe", NULL_PARG);
  			return;
  		}
  		if (logfile >= 0) {
! 			error("Log file is already in use", NULL_PARG);
  			return;
  		}
  		s = skipsp(s);
--- 75,85 ----
  		break;
  	case TOGGLE:
  		if (ch_getflags() & CH_CANSEEK) {
! 			error("Input is not a pipe", NULL);
  			return;
  		}
  		if (logfile >= 0) {
! 			error("Log file is already in use", NULL);
  			return;
  		}
  		s = skipsp(s);
***************
*** 89,95 ****
  		break;
  	case QUERY:
  		if (logfile < 0) {
! 			error("No log file", NULL_PARG);
  		} else {
  			parg.p_string = namelogfile;
  			error("Log file \"%s\"", &parg);
--- 89,95 ----
  		break;
  	case QUERY:
  		if (logfile < 0) {
! 			error("No log file", NULL);
  		} else {
  			parg.p_string = namelogfile;
  			error("Log file \"%s\"", &parg);
***************
*** 126,138 ****
  			s++;
  			jump_sline_fraction = getfraction(&s, "j", &err);
  			if (err)
! 				error("Invalid line fraction", NULL_PARG);
  			else
  				calc_jump_sline();
  		} else {
  			int sline = getnum(&s, "j", &err);
  			if (err) {
! 				error("Invalid line number", NULL_PARG);
  			} else {
  				jump_sline = sline;
  				jump_sline_fraction = -1;
--- 126,138 ----
  			s++;
  			jump_sline_fraction = getfraction(&s, "j", &err);
  			if (err)
! 				error("Invalid line fraction", NULL);
  			else
  				calc_jump_sline();
  		} else {
  			int sline = getnum(&s, "j", &err);
  			if (err) {
! 				error("Invalid line number", NULL);
  			} else {
  				jump_sline = sline;
  				jump_sline_fraction = -1;
***************
*** 183,195 ****
  			s++;
  			shift_count_fraction = getfraction(&s, "#", &err);
  			if (err)
! 				error("Invalid column fraction", NULL_PARG);
  			else
  				calc_shift_count();
  		} else {
  			int hs = getnum(&s, "#", &err);
  			if (err) {
! 				error("Invalid column number", NULL_PARG);
  			} else {
  				shift_count = hs;
  				shift_count_fraction = -1;
--- 183,195 ----
  			s++;
  			shift_count_fraction = getfraction(&s, "#", &err);
  			if (err)
! 				error("Invalid column fraction", NULL);
  			else
  				calc_shift_count();
  		} else {
  			int hs = getnum(&s, "#", &err);
  			if (err) {
! 				error("Invalid column number", NULL);
  			} else {
  				shift_count = hs;
  				shift_count_fraction = -1;
***************
*** 254,260 ****
  		break;
  	case TOGGLE:
  		if (secure) {
! 			error("tags support is not available", NULL_PARG);
  			break;
  		}
  		findtag(skipsp(s));
--- 254,260 ----
  		break;
  	case TOGGLE:
  		if (secure) {
! 			error("tags support is not available", NULL);
  			break;
  		}
  		findtag(skipsp(s));
***************
*** 501,507 ****
  		}
  		if (s[1] != '\0' && s[2] != '\0') {
  			error("-\" must be followed by 1 or 2 chars",
! 			    NULL_PARG);
  			return;
  		}
  		openquote = s[0];
--- 501,507 ----
  		}
  		if (s[1] != '\0' && s[2] != '\0') {
  			error("-\" must be followed by 1 or 2 chars",
! 			    NULL);
  			return;
  		}
  		openquote = s[0];
***************
*** 531,537 ****
  	switch (type) {
  	case QUERY:
  	case TOGGLE:
! 		error("Use \"h\" for help", NULL_PARG);
  		break;
  	case INIT:
  		dohelp = 1;
--- 531,537 ----
  	switch (type) {
  	case QUERY:
  	case TOGGLE:
! 		error("Use \"h\" for help", NULL);
  		break;
  	case INIT:
  		dohelp = 1;