fmt changes from Google

This commit is contained in:
rsc 2006-05-21 20:49:16 +00:00
parent 8d7133308d
commit 85231fd8cd
41 changed files with 507 additions and 505 deletions

View file

@ -1,16 +1,4 @@
/*
* 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.
*/
/* Copyright (c) 2002-2006 Lucent Technologies; see LICENSE */
/*
* dofmt -- format to a buffer
@ -66,9 +54,9 @@ int __strfmt(Fmt *f);
#define FMTCHAR(f, t, s, c)\
do{\
if(t + 1 > (char*)s){\
t = __fmtflush(f, t, 1);\
t = (char*)__fmtflush(f, t, 1);\
if(t != nil)\
s = f->stop;\
s = (char*)f->stop;\
else\
return -1;\
}\
@ -78,9 +66,9 @@ int __strfmt(Fmt *f);
#define FMTRCHAR(f, t, s, c)\
do{\
if(t + 1 > (Rune*)s){\
t = __fmtflush(f, t, sizeof(Rune));\
t = (Rune*)__fmtflush(f, t, sizeof(Rune));\
if(t != nil)\
s = f->stop;\
s = (Rune*)f->stop;\
else\
return -1;\
}\
@ -92,9 +80,9 @@ int __strfmt(Fmt *f);
Rune _rune;\
int _runelen;\
if(t + UTFmax > (char*)s && t + (_runelen = runelen(r)) > (char*)s){\
t = __fmtflush(f, t, _runelen);\
t = (char*)__fmtflush(f, t, _runelen);\
if(t != nil)\
s = f->stop;\
s = (char*)f->stop;\
else\
return -1;\
}\