Merge pull request #204 from darkonie/mnaboka/fix-previous

sdjournal: fix return values type

Author: jonboulle

sdjournal/journal.go

@@ -474,21 +474,21 @@ func (j *Journal) FlushMatches() {
 }
 
 // Next advances the read pointer into the journal by one entry.
-func (j *Journal) Next() (int, error) {
+func (j *Journal) Next() (uint64, error) {
 	sd_journal_next, err := getFunction("sd_journal_next")
 	if err != nil {
-		return -1, err
+		return 0, err
 	}
 
 	j.mu.Lock()
 	r := C.my_sd_journal_next(sd_journal_next, j.cjournal)
 	j.mu.Unlock()
 
 	if r < 0 {
-		return int(r), fmt.Errorf("failed to iterate journal: %d", syscall.Errno(-r))
+		return 0, fmt.Errorf("failed to iterate journal: %d", syscall.Errno(-r))
 	}
 
-	return int(r), nil
+	return uint64(r), nil
 }
 
 // NextSkip advances the read pointer by multiple entries at once,
@@ -504,7 +504,7 @@ func (j *Journal) NextSkip(skip uint64) (uint64, error) {
 	j.mu.Unlock()
 
 	if r < 0 {
-		return uint64(r), fmt.Errorf("failed to iterate journal: %d", syscall.Errno(-r))
+		return 0, fmt.Errorf("failed to iterate journal: %d", syscall.Errno(-r))
 	}
 
 	return uint64(r), nil
@@ -522,7 +522,7 @@ func (j *Journal) Previous() (uint64, error) {
 	j.mu.Unlock()
 
 	if r < 0 {
-		return uint64(r), fmt.Errorf("failed to iterate journal: %d", syscall.Errno(-r))
+		return 0, fmt.Errorf("failed to iterate journal: %d", syscall.Errno(-r))
 	}
 
 	return uint64(r), nil
@@ -541,7 +541,7 @@ func (j *Journal) PreviousSkip(skip uint64) (uint64, error) {
 	j.mu.Unlock()
 
 	if r < 0 {
-		return uint64(r), fmt.Errorf("failed to iterate journal: %d", syscall.Errno(-r))
+		return 0, fmt.Errorf("failed to iterate journal: %d", syscall.Errno(-r))
 	}
 
 	return uint64(r), nil

sdjournal/read.go

@@ -121,7 +121,7 @@ func (r *JournalReader) Read(b []byte) (int, error) {
 	var err error
 
 	if r.msgReader == nil {
-		var c int
+		var c uint64
 
 		// Advance the journal cursor. It has to be called at least one time
 		// before reading