From: Alan Cox Date: Thu, 19 Oct 2017 20:07:55 +0000 (+0100) Subject: tmpfree: update all the usages of brelse that will now be tmpfree X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=8395bd3e1982418583042848ed9557f4e60b7882;p=FUZIX.git tmpfree: update all the usages of brelse that will now be tmpfree --- diff --git a/Kernel/filesys.c b/Kernel/filesys.c index c205f300..5d6cf74e 100644 --- a/Kernel/filesys.c +++ b/Kernel/filesys.c @@ -1,4 +1,4 @@ -#undef DEBUG +#define DEBUG #include #include #include @@ -379,7 +379,7 @@ void filename(char *userspace_upath, char *name) /* And move past the slash, or not the string start */ ptr++; memcpy(name, ptr, FILENAME_LEN); - brelse(buf); + tmpfree(buf); } diff --git a/Kernel/platform-coco2/mini_ide_discard.c b/Kernel/platform-coco2/mini_ide_discard.c index 49eff530..4054e27a 100644 --- a/Kernel/platform-coco2/mini_ide_discard.c +++ b/Kernel/platform-coco2/mini_ide_discard.c @@ -93,5 +93,5 @@ int ide_probe(void) ide_identify(0, buf); if (ide_present) ide_identify(1, buf); - brelse((bufptr) buf); + tmpfree(buf); } diff --git a/Kernel/platform-coco2cart/mini_ide_discard.c b/Kernel/platform-coco2cart/mini_ide_discard.c index 60c7e2c5..2bdfc3cb 100644 --- a/Kernel/platform-coco2cart/mini_ide_discard.c +++ b/Kernel/platform-coco2cart/mini_ide_discard.c @@ -97,5 +97,5 @@ void ide_probe(void) ide_identify(0, buf); if (ide_present) ide_identify(1, buf); - brelse((bufptr) buf); + tmpfree(buf); } diff --git a/Kernel/platform-coco3/main.c b/Kernel/platform-coco3/main.c index 9ea67ac9..be96e4ba 100644 --- a/Kernel/platform-coco3/main.c +++ b/Kernel/platform-coco3/main.c @@ -112,7 +112,7 @@ char *pathbuf(void) void pathfree(char *tb) { - brelse(tb); + tmpfree(tb); } #endif diff --git a/Kernel/platform-coco3/mbr.c b/Kernel/platform-coco3/mbr.c index 9173b975..b3d239f1 100644 --- a/Kernel/platform-coco3/mbr.c +++ b/Kernel/platform-coco3/mbr.c @@ -83,5 +83,5 @@ void mbr_parse(char letter) } /* release temporary memory */ - brelse((bufptr)br); + tmpfree(br); } diff --git a/Kernel/platform-dragon-nx32/devtty.c b/Kernel/platform-dragon-nx32/devtty.c index 17b66b8f..c8d9a2e2 100644 --- a/Kernel/platform-dragon-nx32/devtty.c +++ b/Kernel/platform-dragon-nx32/devtty.c @@ -440,7 +440,7 @@ int gfx_ioctl(uint8_t minor, uarg_t arg, char *ptr) tmp = (uint8_t *)tmpbuf(); err = gfx_draw_op(arg, ptr, tmp); - brelse((bufptr) tmp); + tmpfree(tmp); if (err) { udata.u_error = err; err = -1; diff --git a/Kernel/platform-nc100/devgfx.c b/Kernel/platform-nc100/devgfx.c index 034a0f81..8514d364 100644 --- a/Kernel/platform-nc100/devgfx.c +++ b/Kernel/platform-nc100/devgfx.c @@ -56,7 +56,7 @@ int gfx_ioctl(uint8_t minor, uarg_t arg, char *ptr) if (draw_validate(ptr, l, 480, 64)) goto bad; */ video_cmd(tmp); - brelse((bufptr) tmp); + tmpfree(tmp); return 0; default: udata.u_error = EINVAL; diff --git a/Kernel/platform-trs80/devgfx.c b/Kernel/platform-trs80/devgfx.c index d803d8ef..e6a08ab6 100644 --- a/Kernel/platform-trs80/devgfx.c +++ b/Kernel/platform-trs80/devgfx.c @@ -132,7 +132,7 @@ int gfx_ioctl(uint8_t minor, uarg_t arg, char *ptr) if (vmode == 1) { uint8_t *tmp = (uint8_t *)tmpbuf(); err = gfx_draw_op(arg, ptr, tmp); - brelse((bufptr) tmp); + tmpfree(tmp); if (err) { udata.u_error = err; err = -1; diff --git a/Kernel/platform-z80pack/main.c b/Kernel/platform-z80pack/main.c index 6dddbeca..6bc74af7 100644 --- a/Kernel/platform-z80pack/main.c +++ b/Kernel/platform-z80pack/main.c @@ -55,7 +55,7 @@ char *pathbuf(void) void pathfree(char *tb) { - brelse(tb); + tmpfree(tb); } #endif diff --git a/Kernel/platform-zx128/devmdv.c b/Kernel/platform-zx128/devmdv.c index 2fb1156d..157af7bb 100644 --- a/Kernel/platform-zx128/devmdv.c +++ b/Kernel/platform-zx128/devmdv.c @@ -150,7 +150,7 @@ int mdv_open(uint8_t minor, uint16_t flag) kprintf("mdv_open: had to use secondary map\n"); } memcpy(mdvmap[minor], t, 256); - brelse(t); + tmpfree(t); mdv_motor_off(); } mdv_count[minor]++;