Change the name of a variable from _start to s_start. On alpha there

must be a library function called _start.
This commit is contained in:
John Birrell 1998-05-15 09:26:28 +00:00
parent 93218a8ee4
commit 429f4d134c
3 changed files with 8 additions and 8 deletions

View File

@ -37,7 +37,7 @@
typedef int boolean;
extern boolean _escaped; /* if last character was an escape */
extern char *_start; /* start of the current string */
extern char *s_start; /* start of the current string */
extern char *l_acmbeg; /* string introducing a comment */
extern char *l_acmend; /* string ending a comment */
extern char *l_blkbeg; /* string begining of a block */

View File

@ -54,7 +54,7 @@ static char sccsid[] = "@(#)regexp.c 8.1 (Berkeley) 6/6/93";
static void expconv __P((void));
boolean _escaped; /* true if we are currently _escaped */
char *_start; /* start of string */
char *s_start; /* start of string */
boolean l_onecase; /* true if upper and lower equivalent */
#define makelower(c) (isupper((c)) ? tolower((c)) : (c))
@ -514,7 +514,7 @@ expmatch (s, re, mstring)
ptr = s;
while (*s == ' ' || *s == '\t')
s++;
if (s != ptr || s == _start) {
if (s != ptr || s == s_start) {
/* match, be happy */
matched = 1;
@ -566,7 +566,7 @@ expmatch (s, re, mstring)
/* check for start of line */
case '^':
if (s == _start) {
if (s == s_start) {
/* match, be happy */
matched = 1;

View File

@ -42,7 +42,7 @@ static const char copyright[] =
static char sccsid[] = "@(#)vfontedpr.c 8.1 (Berkeley) 6/6/93";
#endif
static const char rcsid[] =
"$Id: vfontedpr.c,v 1.9 1997/08/26 11:08:24 charnier Exp $";
"$Id: vfontedpr.c,v 1.10 1997/09/18 14:07:33 phk Exp $";
#endif /* not lint */
#include <sys/types.h>
@ -366,7 +366,7 @@ putScp(os)
char *blkeptr; /* end of a lexical block end */
char *nocomptr; /* end of a non-comment delimiter */
_start = os; /* remember the start for expmatch */
s_start = os; /* remember the start for expmatch */
_escaped = FALSE;
if (nokeyw || incomm || instr)
goto skip;
@ -572,14 +572,14 @@ putKcp (start, end, force)
if (*start == '\t') {
while (*start == '\t')
start++;
i = tabs(_start, start) - margin / 8;
i = tabs(s_start, start) - margin / 8;
printf("\\h'|%dn'", i * 10 + 1 - margin % 8);
continue;
}
if (!nokeyw && !force)
if ((*start == '#' || isidchr(*start))
&& (start == _start || !isidchr(start[-1]))) {
&& (start == s_start || !isidchr(start[-1]))) {
i = iskw(start);
if (i > 0) {
ps("\\*(+K");