code review 156410044: debug/pe: remove use of unsafe

debug/pe: remove use of unsafe

Helps in environments with restricted support for unsafe.

[rsc, 2014-10-20 14:45:31]

Hello r (cc: dsymonds, golang-codereviews@googlegroups.com),

I'd like you to review this change to
https://code.google.com/p/go/

[bradfitz, 2014-10-20 15:09:00]

LGTM


On Mon, Oct 20, 2014 at 4:45 PM, <rsc@golang.org> wrote:

> Reviewers: r,
>
> Message:
> Hello r (cc: dsymonds, golang-codereviews@googlegroups.com),
>
> I'd like you to review this change to
> https://code.google.com/p/go/
>
>
> Description:
> debug/pe: remove use of unsafe
>
> Helps in environments with restricted support for unsafe.
>
> Please review this at https://codereview.appspot.com/156410044/
>
> Affected files (+7, -3 lines):
>   M src/debug/pe/file.go
>
>
> Index: src/debug/pe/file.go
> ===================================================================
> --- a/src/debug/pe/file.go
> +++ b/src/debug/pe/file.go
> @@ -13,7 +13,6 @@
>         "io"
>         "os"
>         "strconv"
> -       "unsafe"
>  )
>
>  // A File represents an open PE file.
> @@ -125,6 +124,11 @@
>         return err
>  }
>
> +var (
> +       sizeofOptionalHeader32 = uintptr(binary.Size(OptionalHeader32{}))
> +       sizeofOptionalHeader64 = uintptr(binary.Size(OptionalHeader64{}))
> +)
> +
>  // NewFile creates a new File for accessing a PE binary in an underlying
> reader.
>  func NewFile(r io.ReaderAt) (*File, error) {
>         f := new(File)
> @@ -206,7 +210,7 @@
>         var oh32 OptionalHeader32
>         var oh64 OptionalHeader64
>         switch uintptr(f.FileHeader.SizeOfOptionalHeader) {
> -       case unsafe.Sizeof(oh32):
> +       case sizeofOptionalHeader32:
>                 if err := binary.Read(sr, binary.LittleEndian, &oh32); err
> != nil {
>                         return nil, err
>                 }
> @@ -214,7 +218,7 @@
>                         return nil, fmt.Errorf("pe32 optional header has
> unexpected Magic of 0x%x", oh32.Magic)
>                 }
>                 f.OptionalHeader = &oh32
> -       case unsafe.Sizeof(oh64):
> +       case sizeofOptionalHeader64:
>                 if err := binary.Read(sr, binary.LittleEndian, &oh64); err
> != nil {
>                         return nil, err
>                 }
>
>
> --
> You received this message because you are subscribed to the Google Groups
> "golang-codereviews" group.
> To unsubscribe from this group and stop receiving emails from it, send an
> email to golang-codereviews+unsubscribe@googlegroups.com.
> For more options, visit https://groups.google.com/d/optout.
>

[rsc, 2014-10-20 15:10:03]

*** Submitted as https://code.google.com/p/go/source/detail?r=097d6e4b499c ***

debug/pe: remove use of unsafe

Helps in environments with restricted support for unsafe.

LGTM=bradfitz
R=r, bradfitz
CC=dsymonds, golang-codereviews
https://codereview.appspot.com/156410044

[brainman, 2014-10-20 22:18:03]

Small adjustment https://codereview.appspot.com/157220043/

Alex