From 553c98dca4b4ef9b745700f3d5d03ba4d8fa9fe6 Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Wed, 5 Nov 2008 15:59:34 -0800 Subject: [PATCH] fix renamed-package bug in exported names: always show original name R=ken OCL=18603 CL=18603 --- src/cmd/gc/subr.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/src/cmd/gc/subr.c b/src/cmd/gc/subr.c index b6e225f81c..fbeef81f07 100644 --- a/src/cmd/gc/subr.c +++ b/src/cmd/gc/subr.c @@ -912,14 +912,13 @@ out: int Sconv(Fmt *fp) { - char buf[500]; Sym *s; char *opk, *pkg, *nam; s = va_arg(fp->args, Sym*); if(s == S) { - snprint(buf, sizeof(buf), ""); - goto out; + fmtstrcpy(fp, ""); + return 0; } pkg = ""; @@ -934,18 +933,12 @@ Sconv(Fmt *fp) nam = s->name; if(!(fp->flags & FmtShort)) - if(strcmp(pkg, package) || strcmp(opk, package) || (fp->flags & FmtLong)) { - if(strcmp(opk, pkg) == 0) { - snprint(buf, sizeof(buf), "%s.%s", pkg, nam); - goto out; - } - snprint(buf, sizeof(buf), "(%s)%s.%s", opk, pkg, nam); - goto out; + if(strcmp(opk, package) || (fp->flags & FmtLong)) { + fmtprint(fp, "%s.%s", opk, nam); + return 0; } - snprint(buf, sizeof(buf), "%s", nam); - -out: - return fmtstrcpy(fp, buf); + fmtstrcpy(fp, nam); + return 0; } static char* -- 2.50.0