diff options
| author | rsc <devnull@localhost> | 2004-12-28 19:18:19 +0000 |
|---|---|---|
| committer | rsc <devnull@localhost> | 2004-12-28 19:18:19 +0000 |
| commit | 8b45564f0fd8eccbeaefc79d25470a451c5328d2 (patch) | |
| tree | 7175a13bba22ef89e2ba0a171c41eb0495b9c0f4 /src/libbio | |
| parent | 1369edef9f26a5a127b60b1163564c2570d9a7d9 (diff) | |
| download | plan9port-8b45564f0fd8eccbeaefc79d25470a451c5328d2.tar.gz plan9port-8b45564f0fd8eccbeaefc79d25470a451c5328d2.tar.bz2 plan9port-8b45564f0fd8eccbeaefc79d25470a451c5328d2.zip | |
fix Bprint yet again
Diffstat (limited to 'src/libbio')
| -rw-r--r-- | src/libbio/bfmt.c | 41 | ||||
| -rw-r--r-- | src/libbio/bprint.c | 13 | ||||
| -rw-r--r-- | src/libbio/mkfile | 6 |
3 files changed, 7 insertions, 53 deletions
diff --git a/src/libbio/bfmt.c b/src/libbio/bfmt.c deleted file mode 100644 index 4194d05c..00000000 --- a/src/libbio/bfmt.c +++ /dev/null @@ -1,41 +0,0 @@ -#include "lib9.h" -#include <bio.h> - -static int -_Bfmtflush(Fmt *f) -{ - Biobuf *b; - - b = f->farg; - b->ocount = (char*)f->to - (char*)f->stop; - if(Bflush(b) < 0) - return 0; - f->to = b->ebuf+b->ocount; - return 1; -} - -int -Bfmtinit(Fmt *f, Biobuf *b) -{ - if(b->state != Bwactive) - return -1; - memset(f, 0, sizeof *f); - f->farg = b; - f->start = b->bbuf; - f->to = b->ebuf+b->ocount; - f->stop = b->ebuf; - f->flush = _Bfmtflush; - return 0; -} - -int -Bfmtflush(Fmt *f) -{ - Biobuf *b; - - b = f->farg; - if(f->to == nil) - return -1; - b->ocount = (char*)f->to - (char*)f->stop; - return f->nfmt; -} diff --git a/src/libbio/bprint.c b/src/libbio/bprint.c index f15203ce..8951512f 100644 --- a/src/libbio/bprint.c +++ b/src/libbio/bprint.c @@ -4,16 +4,11 @@ int Bprint(Biobuf *bp, char *fmt, ...) { - va_list args; - Fmt f; int n; + va_list arg; - if(Bfmtinit(&f, bp) < 0) - return -1; - va_start(args, fmt); - n = fmtvprint(&f, fmt, args); - va_end(args); - if(n > 0 && Bfmtflush(&f) < 0) - return -1; + va_start(arg, fmt); + n = Bvprint(bp, fmt, arg); + va_end(arg); return n; } diff --git a/src/libbio/mkfile b/src/libbio/mkfile index db702295..cbe8dac8 100644 --- a/src/libbio/mkfile +++ b/src/libbio/mkfile @@ -6,20 +6,20 @@ OFILES=\ bbuffered.$O\ bfildes.$O\ bflush.$O\ - bfmt.$O\ bgetc.$O\ + bgetrune.$O\ bgetd.$O\ binit.$O\ boffset.$O\ bprint.$O\ bputc.$O\ + bputrune.$O\ brdline.$O\ brdstr.$O\ bread.$O\ bseek.$O\ + bvprint.$O\ bwrite.$O\ - bgetrune.$O\ - bputrune.$O\ HFILES=\ $PLAN9/include/bio.h\ |