o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use gcc -ansi -pedantic in 9c. Fix many non-C89-isms.

Browse source
This commit is contained in:
rsc 2006-04-01 19:24:03 +00:00
parent 226d80b821
commit cbeb0b26e4
492 changed files with 3218 additions and 3167 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/cmd/9660/cdrdwr.c
View file

@ -251,7 +251,7 @@ parsedir(Cdimg *cd, Direc *d, uchar *buf, int len, char *(*cvtname)(uchar*, int)
d->mode = little(p, 4);
}
// BUG: rock ridge extensions
/* BUG: rock ridge extensions */
return 0;
}
@ -604,7 +604,7 @@ Cgetc(Cdimg *cd)
if((c = Bgetc(&cd->brd)) == Beof) {
fprint(2, "getc at %lud\n", Croffset(cd));
assert(0);
//sysfatal("Bgetc: %r");
/*sysfatal("Bgetc: %r"); */
}
return c;
}

14
src/cmd/9660/dump9660.c
View file

@ -203,16 +203,16 @@ main(int argc, char **argv)
} else
convertnames(&iroot, (char* (*)(char*, char*))strcpy);
// isoabstract = findconform(&iroot, abstract);
// isobiblio = findconform(&iroot, biblio);
// isonotice = findconform(&iroot, notice);
/* isoabstract = findconform(&iroot, abstract); */
/* isobiblio = findconform(&iroot, biblio); */
/* isonotice = findconform(&iroot, notice); */
dsort(&iroot, isocmp);
if(cd->flags & CDjoliet) {
// jabstract = findconform(&jroot, abstract);
// jbiblio = findconform(&jroot, biblio);
// jnotice = findconform(&jroot, notice);
/* jabstract = findconform(&jroot, abstract); */
/* jbiblio = findconform(&jroot, biblio); */
/* jnotice = findconform(&jroot, notice); */
checknames(&jroot, isbadjoliet);
convertnames(&jroot, (char* (*)(char*, char*))strcpy);
@ -393,7 +393,7 @@ addprotofile(char *new, char *old, Dir *d, void *a)
if((direc = adddirec((Direc*)a, new, &xd))) {
direc->srcfile = atom(old);
// BUG: abstract, biblio, notice
/* BUG: abstract, biblio, notice */
}
if(name)
free(name);

14
src/cmd/9660/iso9660.h
View file

@ -65,7 +65,7 @@ struct Direc {
int nchild;
};
enum { /* Direc flags */
Dbadname = 1<<0, /* Non-conformant name */
Dbadname = 1<<0 /* Non-conformant name */
};
/*
@ -132,7 +132,7 @@ enum { /* Cdimg->flags, Cdinfo->flags */
CDrockridge = 1<<3,
CDnew = 1<<4,
CDdump = 1<<5,
CDbootable = 1<<6,
CDbootable = 1<<6
};
typedef struct Tx Tx;
@ -159,7 +159,7 @@ struct Cdinfo {
};
enum {
Blocklen = 2048,
Blocklen = 2048
};
/*
@ -265,7 +265,7 @@ enum { /* Rockridge flags */
RR_CL = 1<<4,
RR_PL = 1<<5,
RR_RE = 1<<6,
RR_TF = 1<<7,
RR_TF = 1<<7
};
enum { /* CputrripTF type argument */
@ -276,7 +276,7 @@ enum { /* CputrripTF type argument */
TFbackup = 1<<4,
TFexpiration = 1<<5,
TFeffective = 1<<6,
TFlongform = 1<<7,
TFlongform = 1<<7
};
enum { /* CputrripNM flag types */
@ -285,7 +285,7 @@ enum { /* CputrripNM flag types */
NMparent = 1<<2,
NMroot = 1<<3,
NMvolroot = 1<<4,
NMhost = 1<<5,
NMhost = 1<<5
};
/* boot.c */
@ -414,7 +414,7 @@ enum {
DTdotdot,
DTiden,
DTroot,
DTrootdot,
DTrootdot
};
extern ulong now;

14
src/cmd/9660/sysuse.c
View file

@ -19,7 +19,7 @@ static ulong CputsuspCE(Cdimg *cd, ulong offset);
static int CputsuspER(Cdimg*, int);
static int CputsuspRR(Cdimg*, int, int);
static int CputsuspSP(Cdimg*, int);
//static int CputsuspST(Cdimg*, int);
/*static int CputsuspST(Cdimg*, int); */
static int Cputrripname(Cdimg*, char*, int, char*, int);
static int CputrripSL(Cdimg*, int, int, char*, int);
static int CputrripPX(Cdimg*, Direc*, int, int);
@ -524,12 +524,12 @@ CputrripTF(Cdimg *cd, Direc *d, int type, int dowrite)
if (type & TFattributes)
Cputdate(cd, d?d->ctime:0);
// if (type & TFbackup)
// Cputdate(cd, 0);
// if (type & TFexpiration)
// Cputdate(cd, 0);
// if (type & TFeffective)
// Cputdate(cd, 0);
/* if (type & TFbackup) */
/* Cputdate(cd, 0); */
/* if (type & TFexpiration) */
/* Cputdate(cd, 0); */
/* if (type & TFeffective) */
/* Cputdate(cd, 0); */
}
return 5+7*length;
}

6
src/cmd/9660/unix.c
View file

@ -23,7 +23,7 @@ static long numericgid(char *gp);
void
dirtoxdir(XDir *xd, Dir *d)
{
// char buf[NAMELEN+1];
/* char buf[NAMELEN+1]; */
memset(xd, 0, sizeof *xd);
xd->name = atom(d->name);
@ -38,8 +38,8 @@ dirtoxdir(XDir *xd, Dir *d)
xd->length = d->length;
if(xd->mode & CHLINK) {
xd->mode |= 0777;
//xd->symlink = atom(d->symlink);
xd->symlink = atom("symlink"); // XXX: rsc
/*xd->symlink = atom(d->symlink); */
xd->symlink = atom("symlink"); /* XXX: rsc */
}
}