Fixing reviewed

Signed-off-by: Álvaro Jurado <elbingmiss@gmail.com>

sys/src/cmd/cdfs/main.c

@@ -351,7 +351,7 @@ static void
 readctl(Req *r)
 {
 	int i, isaudio;
-	uint64_t nwa;
+	uint32_t nwa;
 	char *p, *e, *ty;
 	char s[1024];
 	Msf *m;
@@ -383,14 +383,14 @@ readctl(Req *r)
 	p = seprint(p, e, "maxspeed read %d write %d\n",
 		drive->maxreadspeed, drive->maxwritespeed);
 
-	if (drive->changetime != 0 && drive->ntrack != 0) { /* have disc? */
+	if (drive->scsi.changetime != 0 && drive->ntrack != 0) { /* have disc? */
 		ty = disctype(drive);
 		p = seprint(p, e, "%s", ty);
 		free(ty);
 		if (drive->mmctype != Mmcnone) {
 			nwa = getnwa(drive);
 			p = seprint(p, e, " next writable sector ");
-			if (nwa == (uint64_t)~0ul)
+			if (nwa == (uint32_t)~0ul)
 				p = seprint(p, e, "none; disc full");
 			else
 				p = seprint(p, e, "%lu", nwa);

sys/src/cmd/tarsplit/tar.h

@@ -49,7 +49,7 @@ typedef struct {
 
 typedef union {
 	uint8_t	dummy[Tblock];
-	Header *header;
+	Header header;
 } Hblock;
 
 /* tarsub.c */

sys/src/cmd/tarsplit/tarsplit.c

@@ -60,7 +60,7 @@ split(int in, int out, char *inname)
 			out = closeout(out, filenm, 1);
 			if (membsz + Endsize > size)
 				sysfatal("archive member %s (%,lld) + overhead "
-					"exceeds size limit %,lld", hp->header->name,
+					"exceeds size limit %,lld", hp->header.name,
 					len, size);
 		}
 		if (out < 0)

sys/src/cmd/tarsplit/tarsub.c

@@ -32,8 +32,8 @@ checksum(Hblock *hp)
 	int i;
 	uint8_t *cp, *csum, *end;
 
-	i = ' ' * sizeof hp->header->chksum;	/* pretend blank chksum field */
-	csum = (uint8_t *)hp->header->chksum;
+	i = ' ' * sizeof hp->header.chksum;	/* pretend blank chksum field */
+	csum = (uint8_t *)hp->header.chksum;
 	end = &hp->dummy[Tblock];
 	/*
 	 * Unixware gets this wrong; it adds *signed* chars.
@@ -42,7 +42,7 @@ checksum(Hblock *hp)
 	for (cp = hp->dummy; cp < csum; )
 		i += *cp++;
 	/* skip checksum field */
-	for (cp += sizeof hp->header->chksum; cp < end; )
+	for (cp += sizeof hp->header.chksum; cp < end; )
 		i += *cp++;
 	return i;
 }
@@ -107,17 +107,17 @@ getdir(Hblock *hp, int in, int64_t *lenp)
 {
 	*lenp = 0;
 	readtar(in, (char*)hp, Tblock);
-	if (hp->header->name[0] == '\0') { /* zero block indicates end-of-archive */
+	if (hp->header.name[0] == '\0') { /* zero block indicates end-of-archive */
 		lastnm = strdup(thisnm);
 		return 0;
 	}
-	*lenp = otoi(hp->header->size);
-	if (otoi(hp->header->chksum) != checksum(hp))
+	*lenp = otoi(hp->header.size);
+	if (otoi(hp->header.chksum) != checksum(hp))
 		sysfatal("directory checksum error");
 	if (lastnm != nil)
 		free(lastnm);
 	lastnm = thisnm;
-	thisnm = strdup(hp->header->name);
+	thisnm = strdup(hp->header.name);
 	return 1;
 }
 
@@ -130,7 +130,7 @@ passtar(Hblock *hp, int in, int outf, int64_t len)
 	char bigbuf[Blocksxfr*Tblock];		/* 2*(8192 == MAXFDATA) */
 
 	off = outoff;
-	if (islink(hp->header->linkflag))
+	if (islink(hp->header.linkflag))
 		return off;
 	for (blks = TAPEBLKS((uint64_t)len); blks >= Blocksxfr;
 	    blks -= Blocksxfr) {

sys/src/cmd/zenith/edit.c

@@ -31,8 +31,8 @@ struct cmdtab cmdtab[]={
 	{'c',	1,	0,	0,	0,	aDot,	0,	0,	c_cmd},
 	{'d',	0,	0,	0,	0,	aDot,	0,	0,	d_cmd},
 	{'e',	0,	0,	0,	0,	aNo,	0,	wordx,	e_cmd},
-	{'g',	0,	1,	0,	'p',	aDot,	0,	0,	g_cmd},
 	{'f',	0,	0,	0,	0,	aNo,	0,	wordx,	f_cmd},
+	{'g',	0,	1,	0,	'p',	aDot,	0,	0,	g_cmd},
 	{'i',	1,	0,	0,	0,	aDot,	0,	0,	i_cmd},
 	{'m',	0,	0,	1,	0,	aDot,	0,	0,	m_cmd},
 	{'p',	0,	0,	0,	0,	aDot,	0,	0,	p_cmd},