Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Step 1 of the Big Error Shift: make os.Error an interface and replace *os.Errors with os.Errors.

Browse source 
lib/template updated to use new setup; its clients also updated.

Step 2 will make os's error support internally much cleaner.

R=rsc
OCL=27586
CL=27586
This commit is contained in:
Rob Pike 2009-04-17 00:08:24 -07:00
parent 3ea8d854a3
commit aaf63f8d06
57 changed files with 341 additions and 339 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/lib/http/request.go
View file

@ -100,7 +100,7 @@ func (r *Request) ProtoAtLeast(major, minor int) bool {
// Give up if the line exceeds maxLineLength.
// The returned bytes are a pointer into storage in
// the bufio, so they are only valid until the next bufio read.
func readLineBytes(b *bufio.BufRead) (p []byte, err *os.Error) {
func readLineBytes(b *bufio.BufRead) (p []byte, err os.Error) {
if p, err = b.ReadLineSlice('\n'); err != nil {
return nil, err
}
@ -119,7 +119,7 @@ func readLineBytes(b *bufio.BufRead) (p []byte, err *os.Error) {
}
// readLineBytes, but convert the bytes into a string.
func readLine(b *bufio.BufRead) (s string, err *os.Error) {
func readLine(b *bufio.BufRead) (s string, err os.Error) {
p, e := readLineBytes(b);
if e != nil {
return "", e
@ -131,7 +131,7 @@ func readLine(b *bufio.BufRead) (s string, err *os.Error) {
// A key/value has the form Key: Value\r\n
// and the Value can continue on multiple lines if each continuation line
// starts with a space.
func readKeyValue(b *bufio.BufRead) (key, value string, err *os.Error) {
func readKeyValue(b *bufio.BufRead) (key, value string, err os.Error) {
line, e := readLineBytes(b);
if e != nil {
return "", "", e
@ -266,7 +266,7 @@ func CanonicalHeaderKey(s string) string {
}
// ReadRequest reads and parses a request from b.
func ReadRequest(b *bufio.BufRead) (req *Request, err *os.Error) {
func ReadRequest(b *bufio.BufRead) (req *Request, err os.Error) {
req = new(Request);
// First line: GET /index.html HTTP/1.0