libc: introduce "jehanne_" namespace
With this commit all functions declared in libc.h have been renamed with the "jehanne_" prefix. This is done for several reason: - it removes conflicts during symbol resolution when linking standard C libraries like newlib or musl - it allows programs depending on a standard C library to directly link to a library depending on our non standard libc (eg libsec). To ease transiction two files are provided: - sys/include/lib9.h that can be included instead of <libc.h> to use the old names (via a simple set of macros) - sys/src/lib/c/lib9.c that can be compiled with a program where the macro provided by lib9.h are too dumb (see for example rc or grep). In the kernel port/lib.h has been modified accordingly and some of the functions it directly provides has been renamed too (eg malloc in qmalloc.c and print in devcons.c).
This commit is contained in:
@ -68,7 +68,7 @@ devbyname(char *name)
|
||||
int i;
|
||||
|
||||
for(i = 0; devtab[i] != nil; i++)
|
||||
if(strcmp(devtab[i]->name, name) == 0)
|
||||
if(jehanne_strcmp(devtab[i]->name, name) == 0)
|
||||
return devtab[i];
|
||||
return nil;
|
||||
}
|
||||
@ -80,7 +80,7 @@ devtabread(Chan* _1, void* buf, long n, int64_t off)
|
||||
Dev *dev;
|
||||
char *alloc, *e, *p;
|
||||
|
||||
alloc = malloc(READSTR);
|
||||
alloc = jehanne_malloc(READSTR);
|
||||
if(alloc == nil)
|
||||
error(Enomem);
|
||||
|
||||
@ -88,15 +88,15 @@ devtabread(Chan* _1, void* buf, long n, int64_t off)
|
||||
e = p + READSTR;
|
||||
for(i = 0; devtab[i] != nil; i++){
|
||||
dev = devtab[i];
|
||||
p = seprint(p, e, "#%C %s\n", dev->dc, dev->name);
|
||||
p = jehanne_seprint(p, e, "#%C %s\n", dev->dc, dev->name);
|
||||
}
|
||||
|
||||
if(waserror()){
|
||||
free(alloc);
|
||||
jehanne_free(alloc);
|
||||
nexterror();
|
||||
}
|
||||
n = readstr(off, buf, n, alloc);
|
||||
free(alloc);
|
||||
jehanne_free(alloc);
|
||||
poperror();
|
||||
|
||||
return n;
|
||||
|
Reference in New Issue
Block a user