Imported Upstream version 2011.03.07.1upstream/2011.03.07.1

1 files changed, 9 insertions, 9 deletions

diff --git a/src/pkg/fmt/print.go b/src/pkg/fmt/print.go
index d6dc8eb3d..4e14fdaa4 100644
--- a/src/pkg/fmt/print.go
+++ b/src/pkg/fmt/print.go
@@ -348,11 +348,11 @@ func (p *pp) fmtInt64(v int64, verb int, value interface{}) {
 	}
 }
 
-// fmt0x64 formats a uint64 in hexadecimal and prefixes it with 0x by
-// temporarily turning on the sharp flag.
-func (p *pp) fmt0x64(v uint64) {
+// fmt0x64 formats a uint64 in hexadecimal and prefixes it with 0x or
+// not, as requested, by temporarily setting the sharp flag.
+func (p *pp) fmt0x64(v uint64, leading0x bool) {
 	sharp := p.fmt.sharp
-	p.fmt.sharp = true // turn on 0x
+	p.fmt.sharp = leading0x
 	p.fmt.integer(int64(v), 16, unsigned, ldigits)
 	p.fmt.sharp = sharp
 }
@@ -384,7 +384,7 @@ func (p *pp) fmtUint64(v uint64, verb int, goSyntax bool, value interface{}) {
 		p.fmt.integer(int64(v), 10, unsigned, ldigits)
 	case 'v':
 		if goSyntax {
-			p.fmt0x64(v)
+			p.fmt0x64(v, true)
 		} else {
 			p.fmt.integer(int64(v), 10, unsigned, ldigits)
 		}
@@ -534,11 +534,11 @@ func (p *pp) fmtPointer(field interface{}, value reflect.Value, verb int, goSynt
 		if u == 0 {
 			p.buf.Write(nilBytes)
 		} else {
-			p.fmt0x64(uint64(v.Get()))
+			p.fmt0x64(uint64(v.Get()), true)
 		}
 		p.add(')')
 	} else {
-		p.fmt0x64(uint64(u))
+		p.fmt0x64(uint64(u), !p.fmt.sharp)
 	}
 }
 
@@ -801,7 +801,7 @@ BigSwitch:
 			if v == 0 {
 				p.buf.Write(nilBytes)
 			} else {
-				p.fmt0x64(uint64(v))
+				p.fmt0x64(uint64(v), true)
 			}
 			p.buf.WriteByte(')')
 			break
@@ -810,7 +810,7 @@ BigSwitch:
 			p.buf.Write(nilAngleBytes)
 			break
 		}
-		p.fmt0x64(uint64(v))
+		p.fmt0x64(uint64(v), true)
 	case uintptrGetter:
 		p.fmtPointer(field, value, verb, goSyntax)
 	default: