mirror of
https://github.com/golang/go
synced 2024-11-18 18:14:43 -07:00
single argument panic on non-darwin and in comments
R=r CC=golang-dev https://golang.org/cl/800042
This commit is contained in:
parent
ac58f646ac
commit
1231382b9e
@ -430,7 +430,7 @@ func (t *thread) wait() {
|
||||
t.logTrace("beginning wait")
|
||||
ev.Waitmsg, ev.err = os.Wait(t.tid, syscall.WALL)
|
||||
if ev.err == nil && ev.Pid != t.tid {
|
||||
panic("Wait returned pid ", ev.Pid, " wanted ", t.tid)
|
||||
panic(fmt.Sprint("Wait returned pid ", ev.Pid, " wanted ", t.tid))
|
||||
}
|
||||
if ev.StopSignal() == syscall.SIGSTOP && t.ignoreNextSigstop {
|
||||
// Spurious SIGSTOP. See Thread.Stop().
|
||||
|
@ -92,7 +92,7 @@ func (r *_386Regs) Get(i int) Word {
|
||||
case 15:
|
||||
return Word(r.Gs)
|
||||
}
|
||||
panic("invalid register index ", strconv.Itoa(i))
|
||||
panic("invalid register index " + strconv.Itoa(i))
|
||||
}
|
||||
|
||||
func (r *_386Regs) Set(i int, val Word) os.Error {
|
||||
@ -130,7 +130,7 @@ func (r *_386Regs) Set(i int, val Word) os.Error {
|
||||
case 15:
|
||||
r.Gs = uint16(val)
|
||||
default:
|
||||
panic("invalid register index ", strconv.Itoa(i))
|
||||
panic("invalid register index " + strconv.Itoa(i))
|
||||
}
|
||||
return r.setter(&r.PtraceRegs)
|
||||
}
|
||||
|
@ -124,7 +124,7 @@ func (r *amd64Regs) Get(i int) Word {
|
||||
case 23:
|
||||
return Word(r.Gs)
|
||||
}
|
||||
panic("invalid register index ", strconv.Itoa(i))
|
||||
panic("invalid register index " + strconv.Itoa(i))
|
||||
}
|
||||
|
||||
func (r *amd64Regs) Set(i int, val Word) os.Error {
|
||||
@ -178,7 +178,7 @@ func (r *amd64Regs) Set(i int, val Word) os.Error {
|
||||
case 23:
|
||||
r.Gs = uint64(val)
|
||||
default:
|
||||
panic("invalid register index ", strconv.Itoa(i))
|
||||
panic("invalid register index " + strconv.Itoa(i))
|
||||
}
|
||||
return r.setter(&r.PtraceRegs)
|
||||
}
|
||||
|
@ -24,7 +24,7 @@ import (
|
||||
)
|
||||
|
||||
func abort(funcname string, err int) {
|
||||
panic(funcname+" failed: (", err, ") ", syscall.Errstr(err), "\n")
|
||||
panic(funcname + " failed: " + syscall.Errstr(err))
|
||||
}
|
||||
|
||||
func print_version(v uint32) {
|
||||
@ -77,7 +77,7 @@ func getprocaddress(handle uint32, procname uintptr) (proc uintptr)
|
||||
func loadDll(fname string) uint32 {
|
||||
m := loadlibraryex(uintptr(unsafe.Pointer(StringBytePtr(fname))))
|
||||
if m == 0 {
|
||||
panic("syscall: could not LoadLibraryEx ", fname)
|
||||
panic("syscall: could not LoadLibraryEx " + fname)
|
||||
}
|
||||
return m
|
||||
}
|
||||
@ -85,7 +85,7 @@ func loadDll(fname string) uint32 {
|
||||
func getSysProcAddr(m uint32, pname string) uintptr {
|
||||
p := getprocaddress(m, uintptr(unsafe.Pointer(StringBytePtr(pname))))
|
||||
if p == 0 {
|
||||
panic("syscall: could not GetProcAddress for ", pname)
|
||||
panic("syscall: could not GetProcAddress for " + pname)
|
||||
}
|
||||
return p
|
||||
}
|
||||
|
@ -74,14 +74,14 @@ func newClient(resourceName, host, origin, location, protocol string, rwc io.Rea
|
||||
func main() {
|
||||
ws, err := websocket.Dial("ws://localhost/ws", "", "http://localhost/");
|
||||
if err != nil {
|
||||
panic("Dial: ", err.String())
|
||||
panic("Dial: " + err.String())
|
||||
}
|
||||
if _, err := ws.Write([]byte("hello, world!\n")); err != nil {
|
||||
panic("Write: ", err.String())
|
||||
panic("Write: " + err.String())
|
||||
}
|
||||
var msg = make([]byte, 512);
|
||||
if n, err := ws.Read(msg); err != nil {
|
||||
panic("Read: ", err.String())
|
||||
panic("Read: " + err.String())
|
||||
}
|
||||
// use msg[0:n]
|
||||
}
|
||||
|
@ -34,7 +34,7 @@ import (
|
||||
http.Handle("/echo", websocket.Handler(EchoServer));
|
||||
err := http.ListenAndServe(":12345", nil);
|
||||
if err != nil {
|
||||
panic("ListenAndServe: ", err.String())
|
||||
panic("ListenAndServe: " + err.String())
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
Loading…
Reference in New Issue
Block a user