diff options
| author | Robert Griesemer <gri@golang.org> | 2009-11-09 12:07:39 -0800 | 
|---|---|---|
| committer | Robert Griesemer <gri@golang.org> | 2009-11-09 12:07:39 -0800 | 
| commit | e940edc7a026293153ba09ece40e8092a2fc2463 (patch) | |
| tree | c94a425c84b7a48f91a5d76a222effad70c9a88c /src/pkg/patch/git.go | |
| parent | e067f862f1774ab89a2096a88571a94e3b9cd353 (diff) | |
| download | golang-e940edc7a026293153ba09ece40e8092a2fc2463.tar.gz | |
remove semis after statements in one-statement statement lists
R=rsc, r
http://go/go-review/1025029
Diffstat (limited to 'src/pkg/patch/git.go')
| -rw-r--r-- | src/pkg/patch/git.go | 26 | 
1 files changed, 13 insertions, 13 deletions
| diff --git a/src/pkg/patch/git.go b/src/pkg/patch/git.go index fd03f4a92..f9335cc45 100644 --- a/src/pkg/patch/git.go +++ b/src/pkg/patch/git.go @@ -17,7 +17,7 @@ import (  func gitSHA1(data []byte) []byte {  	if len(data) == 0 {  		// special case: 0 length is all zeros sum -		return make([]byte, 20); +		return make([]byte, 20)  	}  	h := sha1.New();  	fmt.Fprintf(h, "blob %d\x00", len(data)); @@ -36,7 +36,7 @@ type GITBinaryLiteral struct {  // Apply implements the Diff interface's Apply method.  func (d *GITBinaryLiteral) Apply(old []byte) ([]byte, os.Error) {  	if sum := gitSHA1(old); !bytes.HasPrefix(sum, d.OldSHA1) { -		return nil, ErrPatchFailure; +		return nil, ErrPatchFailure  	}  	return d.New, nil;  } @@ -44,11 +44,11 @@ func (d *GITBinaryLiteral) Apply(old []byte) ([]byte, os.Error) {  func unhex(c byte) uint8 {  	switch {  	case '0' <= c && c <= '9': -		return c-'0'; +		return c-'0'  	case 'a' <= c && c <= 'f': -		return c-'a'+10; +		return c-'a'+10  	case 'A' <= c && c <= 'F': -		return c-'A'+10; +		return c-'A'+10  	}  	return 255;  } @@ -56,12 +56,12 @@ func unhex(c byte) uint8 {  func getHex(s []byte) (data []byte, rest []byte) {  	n := 0;  	for n < len(s) && unhex(s[n]) != 255 { -		n++; +		n++  	}  	n &^= 1;	// Only take an even number of hex digits.  	data = make([]byte, n/2);  	for i := range data { -		data[i] = unhex(s[2*i])<<4 | unhex(s[2*i + 1]); +		data[i] = unhex(s[2*i])<<4 | unhex(s[2*i + 1])  	}  	rest = s[n:len(s)];  	return; @@ -79,7 +79,7 @@ func ParseGITBinary(raw []byte) (Diff, os.Error) {  		if s, ok := skip(first, "index "); ok {  			oldSHA1, s = getHex(s);  			if s, ok = skip(s, ".."); !ok { -				continue; +				continue  			}  			newSHA1, s = getHex(s);  			continue; @@ -93,28 +93,28 @@ func ParseGITBinary(raw []byte) (Diff, os.Error) {  			d := git85.NewDecoder(bytes.NewBuffer(raw));  			z, err := zlib.NewInflater(d);  			if err != nil { -				return nil, err; +				return nil, err  			}  			defer z.Close();  			if _, err = io.ReadFull(z, data); err != nil {  				if err == os.EOF { -					err = io.ErrUnexpectedEOF; +					err = io.ErrUnexpectedEOF  				}  				return nil, err;  			}  			var buf [1]byte;  			m, err := z.Read(&buf);  			if m != 0 || err != os.EOF { -				return nil, os.NewError("GIT binary literal longer than expected"); +				return nil, os.NewError("GIT binary literal longer than expected")  			}  			if sum := gitSHA1(data); !bytes.HasPrefix(sum, newSHA1) { -				return nil, os.NewError("GIT binary literal SHA1 mismatch"); +				return nil, os.NewError("GIT binary literal SHA1 mismatch")  			}  			return &GITBinaryLiteral{oldSHA1, data}, nil;  		}  		if !sawBinary { -			return nil, os.NewError("unexpected GIT patch header: " + string(first)); +			return nil, os.NewError("unexpected GIT patch header: " + string(first))  		}  	}  	panic("unreachable"); | 
