diff options
| author | Tianon Gravi <admwiggin@gmail.com> | 2015-01-15 12:50:40 -0700 |
|---|---|---|
| committer | Tianon Gravi <admwiggin@gmail.com> | 2015-01-15 12:50:40 -0700 |
| commit | 2a0db60599fdd75b1bc3e297180fbe1282763759 (patch) | |
| tree | 68d43c3e30d9ab961ddf6b7365201ca6b675b253 /src/liblink/list5.c | |
| parent | ef33cba3c8de6c431df56503df51fcd3a473c89e (diff) | |
| parent | f154da9e12608589e8d5f0508f908a0c3e88a1bb (diff) | |
| download | golang-2a0db60599fdd75b1bc3e297180fbe1282763759.tar.gz | |
Merge tag 'upstream/1.4' into debian-experimental
* tag 'upstream/1.4':
Imported Upstream version 1.4
Diffstat (limited to 'src/liblink/list5.c')
| -rw-r--r-- | src/liblink/list5.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/liblink/list5.c b/src/liblink/list5.c index 4a4e8c71f..a91df55e6 100644 --- a/src/liblink/list5.c +++ b/src/liblink/list5.c @@ -46,6 +46,7 @@ static int Pconv(Fmt *fp); static int Rconv(Fmt *fp); static int RAconv(Fmt *fp); static int DSconv(Fmt *fp); +static int DRconv(Fmt*); #pragma varargck type "$" char* #pragma varargck type "M" Addr* @@ -59,6 +60,9 @@ listinit5(void) fmtinstall('P', Pconv); fmtinstall('R', Rconv); + // for liblink internal use + fmtinstall('^', DRconv); + // for internal use fmtinstall('$', DSconv); fmtinstall('M', Mconv); @@ -314,6 +318,19 @@ Rconv(Fmt *fp) } static int +DRconv(Fmt *fp) +{ + char *s; + int a; + + a = va_arg(fp->args, int); + s = "C_??"; + if(a >= C_NONE && a <= C_NCLASS) + s = cnames5[a]; + return fmtstrcpy(fp, s); +} + +static int Mconv(Fmt *fp) { char str[STRINGSZ]; |