Separate multiline Go statements

[onechat] / records.go

diff --git a/records.go b/records.go
index 73a9d8323ad433c75594838262cb5f399c030e8e..52824cb505787e95a8645bb2a55cbf8964442336 100644 (file)
--- a/records.go
+++ b/records.go
@@ -11,11 +11,11 @@ import (
 // positionBytes is the size of an encoded position.
 const positionBytes = 16
 
 // positionBytes is the size of an encoded position.
 const positionBytes = 16
 

-// records is a file of fixed-size records, numbered from 0. Record n starts at
+// Records is a file of fixed-size Records, numbered from 0. Record n starts at

 // byte n*size. A record that was never written reads as zeros. An index is data
 // byte n*size. A record that was never written reads as zeros. An index is data

-// that the day files can give again, so records cuts a partial record at the
+// that the day files can give again, so Records cuts a partial record at the

 // end of the file.
 // end of the file.

-type records struct {
+type Records struct {

        file  *os.File
        size  int
        count int
        file  *os.File
        size  int
        count int


@@ -23,7 +23,7 @@ type records struct {
 
 // openRecords opens or creates the record file at path with records of size
 // bytes.
 
 // openRecords opens or creates the record file at path with records of size
 // bytes.

-func openRecords(path string, size int) (*records, error) {
+func openRecords(path string, size int) (*Records, error) {

        file, err := os.OpenFile(path, os.O_CREATE|os.O_RDWR, 0o600)
        if err != nil {
                return nil, fmt.Errorf("open index: %w", err)
        file, err := os.OpenFile(path, os.O_CREATE|os.O_RDWR, 0o600)
        if err != nil {
                return nil, fmt.Errorf("open index: %w", err)


@@ -34,7 +34,7 @@ func openRecords(path string, size int) (*records, error) {
                return nil, errors.Join(fmt.Errorf("read index size: %w", err), file.Close())
        }
 
                return nil, errors.Join(fmt.Errorf("read index size: %w", err), file.Close())
        }
 

-       r := &records{
+       r := &Records{

                file:  file,
                size:  size,
                count: int(info.Size()) / size,
                file:  file,
                size:  size,
                count: int(info.Size()) / size,


@@ -51,7 +51,7 @@ func openRecords(path string, size int) (*records, error) {
 }
 
 // Read returns record n, or false when the file does not reach it.
 }
 
 // Read returns record n, or false when the file does not reach it.

-func (r *records) Read(n int) ([]byte, bool, error) {
+func (r *Records) Read(n int) ([]byte, bool, error) {

        if n >= r.count {
                return nil, false, nil
        }
        if n >= r.count {
                return nil, false, nil
        }


@@ -66,7 +66,7 @@ func (r *records) Read(n int) ([]byte, bool, error) {
 }
 
 // Write writes record n.
 }
 
 // Write writes record n.

-func (r *records) Write(n int, record []byte) error {
+func (r *Records) Write(n int, record []byte) error {

        _, err := r.file.WriteAt(record, int64(n*r.size))
        if err != nil {
                return fmt.Errorf("write index record %d: %w", n, err)
        _, err := r.file.WriteAt(record, int64(n*r.size))
        if err != nil {
                return fmt.Errorf("write index record %d: %w", n, err)


@@ -78,25 +78,25 @@ func (r *records) Write(n int, record []byte) error {
 }
 
 // Append writes the record after the last one.
 }
 
 // Append writes the record after the last one.

-func (r *records) Append(record []byte) error {
+func (r *Records) Append(record []byte) error {

        return r.Write(r.count, record)
 }
 
 // Close closes the file.
        return r.Write(r.count, record)
 }
 
 // Close closes the file.

-func (r *records) Close() error {
+func (r *Records) Close() error {

        return r.file.Close()
 }
 
 // encodePosition writes place into the first positionBytes bytes of record.
        return r.file.Close()
 }
 
 // encodePosition writes place into the first positionBytes bytes of record.

-func encodePosition(record []byte, place position) {
+func encodePosition(record []byte, place Position) {

        binary.LittleEndian.PutUint32(record[0:], place.day)
        binary.LittleEndian.PutUint32(record[4:], place.length)
        binary.LittleEndian.PutUint64(record[8:], place.offset)
 }
 
 // decodePosition reads a position from the first positionBytes bytes of record.
        binary.LittleEndian.PutUint32(record[0:], place.day)
        binary.LittleEndian.PutUint32(record[4:], place.length)
        binary.LittleEndian.PutUint64(record[8:], place.offset)
 }
 
 // decodePosition reads a position from the first positionBytes bytes of record.

-func decodePosition(record []byte) position {
-       return position{
+func decodePosition(record []byte) Position {
+       return Position{

                day:    binary.LittleEndian.Uint32(record[0:]),
                length: binary.LittleEndian.Uint32(record[4:]),
                offset: binary.LittleEndian.Uint64(record[8:]),
                day:    binary.LittleEndian.Uint32(record[0:]),
                length: binary.LittleEndian.Uint32(record[4:]),
                offset: binary.LittleEndian.Uint64(record[8:]),