updates from p9p
This commit is contained in:
25
libc/fmtfd.c
25
libc/fmtfd.c
@ -1,5 +1,20 @@
|
||||
#include <u.h>
|
||||
#include <libc.h>
|
||||
/*
|
||||
* The authors of this software are Rob Pike and Ken Thompson.
|
||||
* Copyright (c) 2002 by Lucent Technologies.
|
||||
* Permission to use, copy, modify, and distribute this software for any
|
||||
* purpose without fee is hereby granted, provided that this entire notice
|
||||
* is included in all copies of any software which is or includes a copy
|
||||
* or modification of this software and in all copies of the supporting
|
||||
* documentation for such software.
|
||||
* THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED
|
||||
* WARRANTY. IN PARTICULAR, NEITHER THE AUTHORS NOR LUCENT TECHNOLOGIES MAKE
|
||||
* ANY REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
|
||||
* OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
|
||||
*/
|
||||
#include <stdarg.h>
|
||||
#include <string.h>
|
||||
#include "plan9.h"
|
||||
#include "fmt.h"
|
||||
#include "fmtdef.h"
|
||||
|
||||
/*
|
||||
@ -9,7 +24,7 @@
|
||||
int
|
||||
fmtfdflush(Fmt *f)
|
||||
{
|
||||
if(_fmtFdFlush(f) <= 0)
|
||||
if(__fmtFdFlush(f) <= 0)
|
||||
return -1;
|
||||
return f->nfmt;
|
||||
}
|
||||
@ -24,8 +39,8 @@ fmtfdinit(Fmt *f, int fd, char *buf, int size)
|
||||
f->start = buf;
|
||||
f->to = buf;
|
||||
f->stop = buf + size;
|
||||
f->flush = _fmtFdFlush;
|
||||
f->farg = (void*)fd;
|
||||
f->flush = __fmtFdFlush;
|
||||
f->farg = (void*)(uintptr_t)fd;
|
||||
f->nfmt = 0;
|
||||
return 0;
|
||||
}
|
||||
|
Reference in New Issue
Block a user