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

Cast size_t to off_t before adding them to avoid warnings on the alpha.

Browse Source 
Use %ld and intmax_t for printing an off_t.
This commit is contained in:
David Malone 2005-01-10 20:19:46 +00:00
parent a2fb00d93f
commit d0990ea900
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.bin/tail/misc.c
View File

@ -79,7 +79,7 @@ mapprint(struct mapinfo *mip, off_t startoff, off_t len)
while (len > 0) {
if (startoff < mip->mapoff || startoff >= mip->mapoff +
mip->maplen) {
(off_t)mip->maplen) {
if (maparound(mip, startoff) != 0)
return (1);
}
@ -107,7 +107,7 @@ maparound(struct mapinfo *mip, off_t offset)
mip->mapoff = offset & ~((off_t)TAILMAPLEN - 1);
mip->maplen = TAILMAPLEN;
if (mip->maplen > mip->maxoff - mip->mapoff)
if ((off_t)mip->maplen > mip->maxoff - mip->mapoff)
mip->maplen = mip->maxoff - mip->mapoff;
if (mip->maplen <= 0)
abort();

6
usr.bin/tail/reverse.c
View File

@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$");
#include <err.h>
#include <errno.h>
#include <limits.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@ -128,7 +129,8 @@ r_reg(FILE *fp, enum STYLE style, off_t off, struct stat *sbp)
curoff = size - 2;
lineend = size;
while (curoff >= 0) {
if (curoff < map.mapoff || curoff >= map.mapoff + map.maplen) {
if (curoff < map.mapoff ||
curoff >= map.mapoff + (off_t)map.maplen) {
if (maparound(&map, curoff) != 0) {
ierr();
return;
@ -245,7 +247,7 @@ r_buf(FILE *fp)
}
if (enomem) {
warnx("warning: %qd bytes discarded", enomem);
warnx("warning: %jd bytes discarded", (intmax_t)enomem);
rval = 1;
}