Jelajahi Sumber

goprotobuf: disable some logging, plus some safer unmarshaling.

R=r
CC=golang-dev
http://codereview.appspot.com/4482045
David Symonds 15 tahun lalu
induk
melakukan
3fa055feeb
2 mengubah file dengan 5 tambahan dan 2 penghapusan
  1. 4 1
      compiler/generator/generator.go
  2. 1 1
      proto/encode.go

+ 4 - 1
compiler/generator/generator.go

@@ -751,7 +751,10 @@ func (g *Generator) generateImports() {
 		if _, ok := g.usedPackages[fd.PackageName()]; ok {
 			g.P("import ", fd.PackageName(), " ", Quote(filename))
 		} else {
-			log.Println("protoc-gen-go: discarding unused import:", filename)
+			// TODO: Re-enable this when we are more feature-complete.
+			// For instance, some protos use foreign field extensions, which we don't support.
+			// Until then, this is just annoying spam.
+			//log.Printf("protoc-gen-go: discarding unused import from %v: %v", *g.file.Name, s)
 		}
 	}
 	g.P()

+ 1 - 1
proto/encode.go

@@ -514,7 +514,7 @@ func (o *Buffer) enc_slice_struct_message(p *Properties, base uintptr) os.Error
 		// Can the object marshal itself?
 		iv := unsafe.Unreflect(p.stype, unsafe.Pointer(&s[i]))
 		if m, ok := iv.(Marshaler); ok {
-			if reflect.ValueOf(iv).IsNil() {
+			if isNil(reflect.ValueOf(iv)) {
 				return ErrNil
 			}
 			data, err := m.Marshal()