d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sed: unsign some indexes to fix sign-compare warnings.

Browse Source 
Hinted by:	OpenBSD (CVS 1.32)

MFC after:	 1 week
This commit is contained in:
Pedro F. Giffuni 2018-07-30 18:29:46 +00:00
parent 0cd8715680
commit 0649b6706f
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=336926
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
usr.bin/sed/extern.h
View File

@ -41,7 +41,7 @@ extern struct s_appends *appends;
extern regmatch_t *match;
extern size_t maxnsub;
extern u_long linenum;
extern int appendnum;
extern unsigned int appendnum;
extern int aflag, eflag, nflag;
extern const char *fname, *outfname;
extern FILE *infile, *outfile;

16
usr.bin/sed/process.c
View File

@ -79,8 +79,8 @@ static void regsub(SPACE *, char *, char *);
static int substitute(struct s_command *);
struct s_appends *appends; /* Array of pointers to strings to append. */
static int appendx; /* Index into appends array. */
int appendnum; /* Size of appends array. */
static unsigned int appendx; /* Index into appends array. */
unsigned int appendnum; /* Size of appends array. */
static int lastaddr; /* Set by applies if last address of a range. */
static int sdone; /* If any substitutes since last line input. */
@ -385,7 +385,7 @@ substitute(struct s_command *cp)
regex_t *re;
regoff_t slen;
int lastempty, n;
size_t le = 0;
regoff_t le = 0;
char *s;
s = ps;
@ -550,13 +550,13 @@ static void
flush_appends(void)
{
FILE *f;
int count, i;
unsigned int count, idx;
char buf[8 * 1024];
for (i = 0; i < appendx; i++)
switch (appends[i].type) {
for (idx = 0; idx < appendx; idx++)
switch (appends[idx].type) {
case AP_STRING:
fwrite(appends[i].s, sizeof(char), appends[i].len,
fwrite(appends[idx].s, sizeof(char), appends[idx].len,
outfile);
break;
case AP_FILE:
@ -568,7 +568,7 @@ flush_appends(void)
* would be truly bizarre, but possible. It's probably
* not that big a performance win, anyhow.
*/
if ((f = fopen(appends[i].s, "r")) == NULL)
if ((f = fopen(appends[idx].s, "r")) == NULL)
break;
while ((count = fread(buf, sizeof(char), sizeof(buf), f)))
(void)fwrite(buf, sizeof(char), count, outfile);