summaryrefslogtreecommitdiff
path: root/sys/src/cmd/snap/read.c
diff options
context:
space:
mode:
authorcinap_lenrek <cinap_lenrek@felloff.net>2018-11-22 10:31:30 +0100
committercinap_lenrek <cinap_lenrek@felloff.net>2018-11-22 10:31:30 +0100
commit33636932054f74c7a922a9713a9229d6d5fc7f38 (patch)
treea53035e5bbd458088876eca7699b39c9fda25ffa /sys/src/cmd/snap/read.c
parent56927887249d8529afa57c38d7935edb2d9cc49f (diff)
snap: consequently use ulong for page index and count
Diffstat (limited to 'sys/src/cmd/snap/read.c')
-rw-r--r--sys/src/cmd/snap/read.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/sys/src/cmd/snap/read.c b/sys/src/cmd/snap/read.c
index 961781807..f1e552cbe 100644
--- a/sys/src/cmd/snap/read.c
+++ b/sys/src/cmd/snap/read.c
@@ -134,9 +134,9 @@ readseg(Seg **ps, Biobuf *b, Proc *plist)
{
Seg *s;
Page **pp;
- int i, npg;
int t;
int n, len;
+ ulong i, npg;
ulong pid;
uvlong off;
char buf[Pagesize];
@@ -160,13 +160,13 @@ readseg(Seg **ps, Biobuf *b, Proc *plist)
len = Pagesize;
for(i=0; i<npg; i++) {
if(i == npg-1)
- len = s->len - i*Pagesize;
+ len = s->len - (uvlong)i*Pagesize;
switch(t = Bgetc(b)) {
case 'z':
pp[i] = datapage(zero, len);
if(debug)
- fprint(2, "0x%.8llux all zeros\n", s->offset+i*Pagesize);
+ fprint(2, "0x%.8llux all zeros\n", s->offset+(uvlong)i*Pagesize);
break;
case 'm':
case 't':
@@ -177,14 +177,15 @@ readseg(Seg **ps, Biobuf *b, Proc *plist)
if(pp[i] == nil)
panic("bad page reference in snapshot");
if(debug)
- fprint(2, "0x%.8llux same as %s pid %lud 0x%.8llux\n", s->offset+i*Pagesize, t=='m'?"mem":"text", pid, off);
+ fprint(2, "0x%.8llux same as %s pid %lud 0x%.8llux\n",
+ s->offset+(uvlong)i*Pagesize, t=='m'?"mem":"text", pid, off);
break;
case 'r':
if((n=Bread(b, buf, len)) != len)
sysfatal("short read of segment %d/%d at %llx: %r", n, len, Boffset(b));
pp[i] = datapage(buf, len);
if(debug)
- fprint(2, "0x%.8llux is raw data\n", s->offset+i*Pagesize);
+ fprint(2, "0x%.8llux is raw data\n", s->offset+(uvlong)i*Pagesize);
break;
default:
fprint(2, "bad type char %#.2ux\n", t);