diff options
| author | delphij <delphij@FreeBSD.org> | 2016-01-05 05:25:16 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2016-01-05 05:25:16 +0000 |
| commit | 03d374e3a6bf9b6f27de2a5eb994a1850de1e4fb (patch) | |
| tree | 587451b5b5628b51a1932678fc08292d250617f9 /contrib/less/tags.c | |
| parent | ea7f4bcbda6247eed1adbc86025969a1c5cfa442 (diff) | |
| parent | 479faf106b9c06110ca6358bfbd0ef45b838cbc8 (diff) | |
| download | FreeBSD-src-03d374e3a6bf9b6f27de2a5eb994a1850de1e4fb.zip FreeBSD-src-03d374e3a6bf9b6f27de2a5eb994a1850de1e4fb.tar.gz | |
MFV r293125: less v481.
MFC after: 1 month
Relnotes: yes
Diffstat (limited to 'contrib/less/tags.c')
| -rw-r--r-- | contrib/less/tags.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/contrib/less/tags.c b/contrib/less/tags.c index 51fbb56..5acf374 100644 --- a/contrib/less/tags.c +++ b/contrib/less/tags.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2012 Mark Nudelman + * Copyright (C) 1984-2015 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -14,7 +14,8 @@ #if TAGS -public char *tags = "tags"; +public char ztags[] = "tags"; +public char *tags = ztags; static int total; static int curseq; @@ -287,7 +288,7 @@ findctag(tag) cleantags(); total = 0; - taglen = strlen(tag); + taglen = (int) strlen(tag); /* * Search the tags file for the desired tag. @@ -445,7 +446,7 @@ ctagsearch() * If tagendline is set, make sure we match all * the way to end of line (no extra chars after the match). */ - len = strlen(curtag->tag_pattern); + len = (int) strlen(curtag->tag_pattern); if (strncmp(curtag->tag_pattern, line, len) == 0 && (!curtag->tag_endline || line[len] == '\0' || line[len] == '\r')) { @@ -491,7 +492,7 @@ findgtag(tag, type) { fp = stdin; /* Set tag default because we cannot read stdin again. */ - tags = "tags"; + tags = ztags; } else { #if !HAVE_POPEN @@ -551,7 +552,7 @@ findgtag(tag, type) #endif return TAG_INTR; } - len = strlen(buf); + len = (int) strlen(buf); if (len > 0 && buf[len-1] == '\n') buf[len-1] = '\0'; else |
