Use gcc -ansi -pedantic in 9c. Fix many non-C89-isms.
This commit is contained in:
parent
226d80b821
commit
cbeb0b26e4
492 changed files with 3218 additions and 3167 deletions
|
|
@ -111,13 +111,13 @@ p9malloc(ulong n)
|
|||
void *v;
|
||||
if(n == 0)
|
||||
n++;
|
||||
//fprint(2, "%s %d malloc\n", argv0, getpid());
|
||||
/*fprint(2, "%s %d malloc\n", argv0, getpid()); */
|
||||
lock(&malloclock);
|
||||
mallocpid = getpid();
|
||||
v = malloc(n+Overhead);
|
||||
v = mark(v, getcallerpc(&n), n, MallocMagic);
|
||||
unlock(&malloclock);
|
||||
//fprint(2, "%s %d donemalloc\n", argv0, getpid());
|
||||
/*fprint(2, "%s %d donemalloc\n", argv0, getpid()); */
|
||||
return v;
|
||||
}
|
||||
|
||||
|
|
@ -127,13 +127,13 @@ p9free(void *v)
|
|||
if(v == nil)
|
||||
return;
|
||||
|
||||
//fprint(2, "%s %d free\n", argv0, getpid());
|
||||
/*fprint(2, "%s %d free\n", argv0, getpid()); */
|
||||
lock(&malloclock);
|
||||
mallocpid = getpid();
|
||||
v = mark(v, getcallerpc(&v), 0, FreeMagic);
|
||||
free(v);
|
||||
unlock(&malloclock);
|
||||
//fprint(2, "%s %d donefree\n", argv0, getpid());
|
||||
/*fprint(2, "%s %d donefree\n", argv0, getpid()); */
|
||||
}
|
||||
|
||||
void*
|
||||
|
|
@ -141,26 +141,26 @@ p9calloc(ulong a, ulong b)
|
|||
{
|
||||
void *v;
|
||||
|
||||
//fprint(2, "%s %d calloc\n", argv0, getpid());
|
||||
/*fprint(2, "%s %d calloc\n", argv0, getpid()); */
|
||||
lock(&malloclock);
|
||||
mallocpid = getpid();
|
||||
v = calloc(a*b+Overhead, 1);
|
||||
v = mark(v, getcallerpc(&a), a*b, CallocMagic);
|
||||
unlock(&malloclock);
|
||||
//fprint(2, "%s %d donecalloc\n", argv0, getpid());
|
||||
/*fprint(2, "%s %d donecalloc\n", argv0, getpid()); */
|
||||
return v;
|
||||
}
|
||||
|
||||
void*
|
||||
p9realloc(void *v, ulong n)
|
||||
{
|
||||
//fprint(2, "%s %d realloc\n", argv0, getpid());
|
||||
/*fprint(2, "%s %d realloc\n", argv0, getpid()); */
|
||||
lock(&malloclock);
|
||||
mallocpid = getpid();
|
||||
v = mark(v, getcallerpc(&v), 0, CheckMagic);
|
||||
v = realloc(v, n+Overhead);
|
||||
v = mark(v, getcallerpc(&v), n, ReallocMagic);
|
||||
unlock(&malloclock);
|
||||
//fprint(2, "%s %d donerealloc\n", argv0, getpid());
|
||||
/*fprint(2, "%s %d donerealloc\n", argv0, getpid()); */
|
||||
return v;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ encodefmt(Fmt *f)
|
|||
int ilen;
|
||||
int rv;
|
||||
uchar *b;
|
||||
char obuf[64]; // rsc optimization
|
||||
char obuf[64]; /* rsc optimization */
|
||||
|
||||
b = va_arg(f->args, uchar*);
|
||||
if(b == 0)
|
||||
|
|
@ -44,7 +44,7 @@ encodefmt(Fmt *f)
|
|||
} else
|
||||
buf = obuf;
|
||||
|
||||
// convert
|
||||
/* convert */
|
||||
out = buf;
|
||||
switch(f->r){
|
||||
case '<':
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
enum
|
||||
{
|
||||
EPLAN9 = 0x19283745,
|
||||
EPLAN9 = 0x19283745
|
||||
};
|
||||
|
||||
char *(*_syserrstr)(void);
|
||||
|
|
|
|||
|
|
@ -286,7 +286,7 @@ found:
|
|||
if(e >= -5 && e <= prec) {
|
||||
c1 = -e - 1;
|
||||
c4 = prec - e;
|
||||
chr = 'h'; // flag for 'f' style
|
||||
chr = 'h'; /* flag for 'f' style */
|
||||
}
|
||||
break;
|
||||
case 'f':
|
||||
|
|
|
|||
|
|
@ -209,7 +209,7 @@ __quotestrfmt(int runesin, Fmt *f)
|
|||
outlen = (char*)f->stop - (char*)f->to;
|
||||
|
||||
__quotesetup(s, r, nin, outlen, &q, f->flags&FmtSharp, f->runes);
|
||||
//print("bytes in %d bytes out %d runes in %d runesout %d\n", q.nbytesin, q.nbytesout, q.nrunesin, q.nrunesout);
|
||||
/*print("bytes in %d bytes out %d runes in %d runesout %d\n", q.nbytesin, q.nbytesout, q.nrunesin, q.nrunesout); */
|
||||
|
||||
if(runesin){
|
||||
if(!q.quoted)
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ enum
|
|||
S4, /* _+#.# #S4 eS5 */
|
||||
S5, /* _+#.#e +S6 #S7 */
|
||||
S6, /* _+#.#e+ #S7 */
|
||||
S7, /* _+#.#e+# #S7 */
|
||||
S7 /* _+#.#e+# #S7 */
|
||||
};
|
||||
|
||||
static int xcmp(char*, char*);
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ struct Sig
|
|||
enum
|
||||
{
|
||||
Restart = 1<<0,
|
||||
Ignore = 1<<1,
|
||||
Ignore = 1<<1
|
||||
};
|
||||
|
||||
static Sig sigs[] = {
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ enum
|
|||
Maskx = (1<<Bitx)-1, /* 0011 1111 */
|
||||
Testx = Maskx ^ 0xFF, /* 1100 0000 */
|
||||
|
||||
Bad = Runeerror,
|
||||
Bad = Runeerror
|
||||
};
|
||||
|
||||
int
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@
|
|||
* ANY REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
|
||||
* OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
|
||||
*/
|
||||
#define _BSD_SOURCE 1 /* memccpy */
|
||||
#include <stdarg.h>
|
||||
#include <string.h>
|
||||
#include "plan9.h"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue