qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-22 17:54:45 -07:00
Code Releases Activity

Fix declared and not used errors in ogle.

Browse Source 
R=rsc
APPROVED=rsc
DELTA=8  (0 added, 2 deleted, 6 changed)
OCL=34854
CL=34965
This commit is contained in:
Austin Clements 2009-09-24 08:32:59 -07:00
parent 9f6328633d
commit 495b3db88b
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
usr/austin/ogle/cmd.go
View File

@ -94,7 +94,7 @@ var cmds = []cmd {
// successful, it returns the command and the bytes remaining after // successful, it returns the command and the bytes remaining after
// the command, which should be passed to the command. // the command, which should be passed to the command.
func getCmd(line []byte) (*cmd, []byte) { func getCmd(line []byte) (*cmd, []byte) {
sc, ev := newScanner(line); sc, _ := newScanner(line);
pos, tok, lit := sc.Scan(); pos, tok, lit := sc.Scan();
if sc.ErrorCount != 0 || tok != token.IDENT { if sc.ErrorCount != 0 || tok != token.IDENT {
return nil, nil; return nil, nil;
@ -208,8 +208,7 @@ func parseLoad(args []byte) (ident string, path string, err os.Error) {
var toks [4]token.Token; var toks [4]token.Token;
var lits [4][]byte; var lits [4][]byte;
for i := range toks { for i := range toks {
var pos token.Position; _, toks[i], lits[i] = sc.Scan();
pos, toks[i], lits[i] = sc.Scan();
} }
if sc.ErrorCount != 0 { if sc.ErrorCount != 0 {
err = ev.GetError(scanner.NoMultiples); err = ev.GetError(scanner.NoMultiples);
@ -287,7 +286,7 @@ func cmdBt(args []byte) os.Error {
func parseNoArgs(args []byte, usage string) os.Error { func parseNoArgs(args []byte, usage string) os.Error {
sc, ev := newScanner(args); sc, ev := newScanner(args);
pos, tok, lit := sc.Scan(); _, tok, _ := sc.Scan();
if sc.ErrorCount != 0 { if sc.ErrorCount != 0 {
return ev.GetError(scanner.NoMultiples); return ev.GetError(scanner.NoMultiples);
} }

4
usr/austin/ogle/rtype.go
View File

@ -38,7 +38,7 @@ func newManualType(t eval.Type, arch Arch) *remoteType {
} }
// Get the type map for this architecture // Get the type map for this architecture
typeMap, ok := manualTypes[arch]; typeMap, _ := manualTypes[arch];
if typeMap == nil { if typeMap == nil {
typeMap = make(map[eval.Type] *remoteType); typeMap = make(map[eval.Type] *remoteType);
manualTypes[arch] = typeMap; manualTypes[arch] = typeMap;
@ -74,7 +74,7 @@ func newManualType(t eval.Type, arch Arch) *remoteType {
rt = &remoteType{t, arch.PtrSize(), arch.PtrSize(), mk}; rt = &remoteType{t, arch.PtrSize(), arch.PtrSize(), mk};
// Construct the element type after registering the // Construct the element type after registering the
// type to break cycles. // type to break cycles.
typeMap[t] = rt; typeMap[eval.Type(t)] = rt;
elem = newManualType(t.Elem, arch); elem = newManualType(t.Elem, arch);
case *eval.ArrayType: case *eval.ArrayType:

1
usr/austin/ogle/rvalue.go
View File

@ -7,7 +7,6 @@ package ogle
import ( import (
"eval"; "eval";
"fmt"; "fmt";
"os";
"ptrace"; "ptrace";
) )

2
usr/austin/ogle/vars.go
View File

@ -142,7 +142,7 @@ func (p *Process) populateWorld(w *eval.World) os.Error {
// Symbol name // Symbol name
name := sc.BaseName(); name := sc.BaseName();
if prev, ok := pkg[name]; ok { if _, ok := pkg[name]; ok {
log.Stderrf("Multiple definitions of symbol %s", sc.Name); log.Stderrf("Multiple definitions of symbol %s", sc.Name);
continue; continue;
} }