diff options
| author | rsc <devnull@localhost> | 2006-05-21 20:49:16 +0000 |
|---|---|---|
| committer | rsc <devnull@localhost> | 2006-05-21 20:49:16 +0000 |
| commit | 85231fd8cdf32d861e196d7dfa827b7239157817 (patch) | |
| tree | 467cd12c69cbb79e90e28a9750a4397cc3b80143 /src/lib9/fmt/dorfmt.c | |
| parent | 8d7133308db580d2356d5d1dd30f0b9a1f0a7417 (diff) | |
| download | plan9port-85231fd8cdf32d861e196d7dfa827b7239157817.tar.gz plan9port-85231fd8cdf32d861e196d7dfa827b7239157817.tar.bz2 plan9port-85231fd8cdf32d861e196d7dfa827b7239157817.zip | |
fmt changes from Google
Diffstat (limited to 'src/lib9/fmt/dorfmt.c')
| -rw-r--r-- | src/lib9/fmt/dorfmt.c | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/src/lib9/fmt/dorfmt.c b/src/lib9/fmt/dorfmt.c index 034dea14..21e42ebc 100644 --- a/src/lib9/fmt/dorfmt.c +++ b/src/lib9/fmt/dorfmt.c @@ -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 */ #include <stdarg.h> #include <string.h> #include "plan9.h" @@ -19,6 +7,7 @@ /* format the output into f->to and return the number of characters fmted */ +/* BUG: THIS FILE IS NOT UPDATED TO THE NEW SPEC */ int dorfmt(Fmt *f, const Rune *fmt) { @@ -30,8 +19,8 @@ dorfmt(Fmt *f, const Rune *fmt) nfmt = f->nfmt; for(;;){ if(f->runes){ - rt = f->to; - rs = f->stop; + rt = (Rune*)f->to; + rs = (Rune*)f->stop; while((r = *fmt++) && r != '%'){ FMTRCHAR(f, rt, rs, r); } @@ -41,8 +30,8 @@ dorfmt(Fmt *f, const Rune *fmt) return f->nfmt - nfmt; f->stop = rs; }else{ - t = f->to; - s = f->stop; + t = (char*)f->to; + s = (char*)f->stop; while((r = *fmt++) && r != '%'){ FMTRUNE(f, t, f->stop, r); } @@ -53,7 +42,7 @@ dorfmt(Fmt *f, const Rune *fmt) f->stop = s; } - fmt = __fmtdispatch(f, (Rune*)fmt, 1); + fmt = (Rune*)__fmtdispatch(f, (Rune*)fmt, 1); if(fmt == nil) return -1; } |