use int32 (for protobuf support)

Author: sqs

diff/diff.pb.go

@@ -35,19 +35,19 @@ message FileDiff {
 // unified diff.
 message Hunk {
 	// starting line number in original file
-	int32 orig_start_line = 1 [(gogoproto.customtype) = "int"];
+	int32 orig_start_line = 1;
 
 	// number of lines the hunk applies to in the original file
-	int32 orig_lines = 2 [(gogoproto.customtype) = "int"];
+	int32 orig_lines = 2;
 
 	// if > 0, then the original file had a 'No newline at end of file' mark at this offset
-	int32 orig_no_newline_at = 3 [(gogoproto.customtype) = "int"];
+	int32 orig_no_newline_at = 3;
 
 	// starting line number in new file
-	int32 new_start_line = 4 [(gogoproto.customtype) = "int"];
+	int32 new_start_line = 4;
 
 	// number of lines the hunk applies to in the new file
-	int32 new_lines = 5 [(gogoproto.customtype) = "int"];
+	int32 new_lines = 5;
 
 	// optional section heading
 	string section = 6;
@@ -56,7 +56,7 @@ message Hunk {
 	// only set when Hunks are read from entire file diff (i.e., when ReadAllHunks is
 	// called) This accounts for hunk headers, too, so the StartPosition of the first
 	// hunk will be 1.
-	int32 start_position = 7 [(gogoproto.customtype) = "int"];
+	int32 start_position = 7;
 
 	// hunk body (lines prefixed with '-', '+', or ' ')
 	bytes body = 8;
@@ -65,12 +65,12 @@ message Hunk {
 // A Stat is a diff stat that represents the number of lines added/changed/deleted.
 message Stat {
 	// number of lines added
-	int32 added = 1 [(gogoproto.customtype) = "int"];
+	int32 added = 1;
 
 	// number of lines changed
-	int32 changed = 2 [(gogoproto.customtype) = "int"];
+	int32 changed = 2;
 
 	// number of lines deleted
-	int32 deleted = 3 [(gogoproto.customtype) = "int"];
+	int32 deleted = 3;
 }
 

diff/diff.proto

@@ -418,7 +418,7 @@ func (r *HunksReader) ReadHunk() (*Hunk, error) {
 					// the the next line of the new file, which is not
 					// validly formatted) but record that the orig had
 					// no newline.
-					r.hunk.OrigNoNewlineAt = len(r.hunk.Body)
+					r.hunk.OrigNoNewlineAt = int32(len(r.hunk.Body))
 				} else {
 					// Remove previous line's newline.
 					if len(r.hunk.Body) != 0 {
@@ -503,7 +503,7 @@ func normalizeHeader(header string) (string, string, error) {
 // reported.
 func (r *HunksReader) ReadAllHunks() ([]*Hunk, error) {
 	var hunks []*Hunk
-	linesRead := 0
+	linesRead := int32(0)
 	for {
 		hunk, err := r.ReadHunk()
 		if err == io.EOF {
@@ -513,7 +513,7 @@ func (r *HunksReader) ReadAllHunks() ([]*Hunk, error) {
 			linesRead++ // account for the hunk header line
 			hunk.StartPosition = linesRead
 			hunks = append(hunks, hunk)
-			linesRead += bytes.Count(hunk.Body, []byte{'\n'})
+			linesRead += int32(bytes.Count(hunk.Body, []byte{'\n'}))
 		}
 		if err != nil {
 			return hunks, err