JehanneOS/jehanne
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

libc: introduce "jehanne_" namespace

Browse Source 
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:
Giacomo Tesio
2017-04-19 23:33:14 +02:00
parent d38f7bb488
commit e70feee4a3
1195 changed files with 8385 additions and 7803 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
sys/src/kern/port/devpipe.c
View File

@ -52,20 +52,20 @@ pipeattach(Chan *c, Chan *ac, char *spec, int flags)
Pipe *p;
c = devattach('|', spec);
p = malloc(sizeof(Pipe));
p = jehanne_malloc(sizeof(Pipe));
if(p == 0)
exhausted("memory");
p->ref = 1;
p->q[0] = qopen(PIPEQSIZE, 0, 0, 0);
if(p->q[0] == 0){
free(p);
jehanne_free(p);
exhausted("memory");
}
p->q[1] = qopen(PIPEQSIZE, 0, 0, 0);
if(p->q[1] == 0){
free(p->q[0]);
free(p);
jehanne_free(p->q[0]);
jehanne_free(p);
exhausted("memory");
}
@ -125,7 +125,7 @@ pipewalk(Chan *c, Chan *nc, char **name, int nname)
qlock(p);
p->ref++;
if(c->flag & COPEN){
print("channel open in pipewalk\n");
jehanne_print("channel open in pipewalk\n");
switch(PIPETYPE(c->qid.path)){
case Qdata0:
p->qref[0]++;
@ -161,7 +161,7 @@ pipestat(Chan *c, uint8_t *db, long n)
default:
panic("pipestat");
}
n = convD2M(&dir, db, n);
n = jehanne_convD2M(&dir, db, n);
if(n < BIT16SZ)
error(Eshortstat);
return n;
@ -248,9 +248,9 @@ pipeclose(Chan *c)
p->ref--;
if(p->ref == 0){
qunlock(p);
free(p->q[0]);
free(p->q[1]);
free(p);
jehanne_free(p->q[0]);
jehanne_free(p->q[1]);
jehanne_free(p);
} else
qunlock(p);
}
@ -302,7 +302,7 @@ pipewrite(Chan *c, void *va, long n, int64_t _1)
Pipe *p;
if(!islo())
print("pipewrite hi %#p\n", getcallerpc());
jehanne_print("pipewrite hi %#p\n", getcallerpc());
if(waserror()) {
/* avoid notes when pipe is a mounted queue */
if((c->flag & CMSG) == 0)