code review 5319057: cgo, gotest: use error instead of os.Error in generated code

src/cmd/cgo/out.go

 // Copyright 2009 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
 package main
 
 import (
         "bytes"
         "debug/elf"
         "debug/macho"
@@ skipping 30 matching lines @@
 
         // Write second Go output: definitions of _C_xxx.
         // In a separate file so that the import of "unsafe" does not
         // pollute the original file.
         fmt.Fprintf(fgo2, "// Created by cgo - DO NOT EDIT\n\n")
         fmt.Fprintf(fgo2, "package %s\n\n", p.PackageName)
         fmt.Fprintf(fgo2, "import \"unsafe\"\n\n")
         fmt.Fprintf(fgo2, "import \"os\"\n\n")
         fmt.Fprintf(fgo2, "import _ \"runtime/cgo\"\n\n")
         fmt.Fprintf(fgo2, "type _ unsafe.Pointer\n\n")
-        fmt.Fprintf(fgo2, "func _Cerrno(dst *os.Error, x int) { *dst = os.Errno(x) }\n")
+        fmt.Fprintf(fgo2, "func _Cerrno(dst *error, x int) { *dst = os.Errno(x) }\n")
 
         for name, def := range typedef {
                 fmt.Fprintf(fgo2, "type %s ", name)
                 printer.Fprint(fgo2, fset, def)
                 fmt.Fprintf(fgo2, "\n")
         }
         fmt.Fprintf(fgo2, "type _Ctype_void [0]byte\n")
 
         fmt.Fprintf(fc, cProlog)
 
@@ skipping 134 matching lines @@
                 }
                 fmt.Fprintf(&buf, "\t\t%s%s r;\n", qual, t.C)
                 off += t.Size
         }
         if off%p.PtrSize != 0 {
                 pad := p.PtrSize - off%p.PtrSize
                 fmt.Fprintf(&buf, "\t\tchar __pad%d[%d];\n", off, pad)
                 off += pad
         }
         if n.AddError {
-                fmt.Fprint(&buf, "\t\tvoid *e[2]; /* os.Error */\n")
+                fmt.Fprint(&buf, "\t\tvoid *e[2]; /* error */\n")
                 off += 2 * p.PtrSize
         }
         if off == 0 {
                 fmt.Fprintf(&buf, "\t\tchar unused;\n") // avoid empty struct
         }
         fmt.Fprintf(&buf, "\t}")
         return buf.String(), off
 }
 
 func (p *Package) writeDefsFunc(fc, fgo2 *os.File, n *Name) {
         name := n.Go
         gtype := n.FuncType.Go
         if n.AddError {
-                // Add "os.Error" to return type list.
+                // Add "error" to return type list.
                 // Type list is known to be 0 or 1 element - it's a C function.
-                err := &ast.Field{Type: ast.NewIdent("os.Error")}
+                err := &ast.Field{Type: ast.NewIdent("error")}
                 l := gtype.Results.List
                 if len(l) == 0 {
                         l = []*ast.Field{err}
                 } else {
                         l = []*ast.Field{l[0], err}
                 }
                 t := new(ast.FuncType)
                 *t = *gtype
                 t.Results = &ast.FieldList{List: l}
                 gtype = t
@@ skipping 503 matching lines @@
 typedef unsigned short ushort;
 typedef long long int64;
 typedef unsigned long long uint64;
 typedef __SIZE_TYPE__ uintptr;
 
 typedef struct { char *p; int n; } GoString;
 typedef void *GoMap;
 typedef void *GoChan;
 typedef struct { void *t; void *v; } GoInterface;
 `