mirror of
https://github.com/mumble-voip/grumble.git
synced 2025-12-20 14:20:00 -08:00
Major gofix run.
This commit is contained in:
Mikkel Krautz
parent
92e6ac5276
commit
71b8314c2e
28 changed files with 522 additions and 559 deletions
|
|
@ -28,17 +28,18 @@ static int my_bind_blob(sqlite3_stmt *stmt, int n, void *p, int np) {
|
|||
import "C"
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"os"
|
||||
"reflect"
|
||||
"strconv"
|
||||
"unsafe"
|
||||
"time"
|
||||
"unsafe"
|
||||
)
|
||||
|
||||
type Errno int
|
||||
|
||||
func (e Errno) String() string {
|
||||
func (e Errno) Error() string {
|
||||
s := errText[e]
|
||||
if s == "" {
|
||||
return fmt.Sprintf("errno %d", int(e))
|
||||
|
|
@ -47,76 +48,76 @@ func (e Errno) String() string {
|
|||
}
|
||||
|
||||
var (
|
||||
ErrError os.Error = Errno(1) // /* SQL error or missing database */
|
||||
ErrInternal os.Error = Errno(2) // /* Internal logic error in SQLite */
|
||||
ErrPerm os.Error = Errno(3) // /* Access permission denied */
|
||||
ErrAbort os.Error = Errno(4) // /* Callback routine requested an abort */
|
||||
ErrBusy os.Error = Errno(5) // /* The database file is locked */
|
||||
ErrLocked os.Error = Errno(6) // /* A table in the database is locked */
|
||||
ErrNoMem os.Error = Errno(7) // /* A malloc() failed */
|
||||
ErrReadOnly os.Error = Errno(8) // /* Attempt to write a readonly database */
|
||||
ErrInterrupt os.Error = Errno(9) // /* Operation terminated by sqlite3_interrupt()*/
|
||||
ErrIOErr os.Error = Errno(10) // /* Some kind of disk I/O error occurred */
|
||||
ErrCorrupt os.Error = Errno(11) // /* The database disk image is malformed */
|
||||
ErrFull os.Error = Errno(13) // /* Insertion failed because database is full */
|
||||
ErrCantOpen os.Error = Errno(14) // /* Unable to open the database file */
|
||||
ErrEmpty os.Error = Errno(16) // /* Database is empty */
|
||||
ErrSchema os.Error = Errno(17) // /* The database schema changed */
|
||||
ErrTooBig os.Error = Errno(18) // /* String or BLOB exceeds size limit */
|
||||
ErrConstraint os.Error = Errno(19) // /* Abort due to constraint violation */
|
||||
ErrMismatch os.Error = Errno(20) // /* Data type mismatch */
|
||||
ErrMisuse os.Error = Errno(21) // /* Library used incorrectly */
|
||||
ErrNolfs os.Error = Errno(22) // /* Uses OS features not supported on host */
|
||||
ErrAuth os.Error = Errno(23) // /* Authorization denied */
|
||||
ErrFormat os.Error = Errno(24) // /* Auxiliary database format error */
|
||||
ErrRange os.Error = Errno(25) // /* 2nd parameter to sqlite3_bind out of range */
|
||||
ErrNotDB os.Error = Errno(26) // /* File opened that is not a database file */
|
||||
Row = Errno(100) // /* sqlite3_step() has another row ready */
|
||||
Done = Errno(101) // /* sqlite3_step() has finished executing */
|
||||
ErrError error = Errno(1) // /* SQL error or missing database */
|
||||
ErrInternal error = Errno(2) // /* Internal logic error in SQLite */
|
||||
ErrPerm error = Errno(3) // /* Access permission denied */
|
||||
ErrAbort error = Errno(4) // /* Callback routine requested an abort */
|
||||
ErrBusy error = Errno(5) // /* The database file is locked */
|
||||
ErrLocked error = Errno(6) // /* A table in the database is locked */
|
||||
ErrNoMem error = Errno(7) // /* A malloc() failed */
|
||||
ErrReadOnly error = Errno(8) // /* Attempt to write a readonly database */
|
||||
ErrInterrupt error = Errno(9) // /* Operation terminated by sqlite3_interrupt()*/
|
||||
ErrIOErr error = Errno(10) // /* Some kind of disk I/O error occurred */
|
||||
ErrCorrupt error = Errno(11) // /* The database disk image is malformed */
|
||||
ErrFull error = Errno(13) // /* Insertion failed because database is full */
|
||||
ErrCantOpen error = Errno(14) // /* Unable to open the database file */
|
||||
ErrEmpty error = Errno(16) // /* Database is empty */
|
||||
ErrSchema error = Errno(17) // /* The database schema changed */
|
||||
ErrTooBig error = Errno(18) // /* String or BLOB exceeds size limit */
|
||||
ErrConstraint error = Errno(19) // /* Abort due to constraint violation */
|
||||
ErrMismatch error = Errno(20) // /* Data type mismatch */
|
||||
ErrMisuse error = Errno(21) // /* Library used incorrectly */
|
||||
ErrNolfs error = Errno(22) // /* Uses OS features not supported on host */
|
||||
ErrAuth error = Errno(23) // /* Authorization denied */
|
||||
ErrFormat error = Errno(24) // /* Auxiliary database format error */
|
||||
ErrRange error = Errno(25) // /* 2nd parameter to sqlite3_bind out of range */
|
||||
ErrNotDB error = Errno(26) // /* File opened that is not a database file */
|
||||
Row = Errno(100) // /* sqlite3_step() has another row ready */
|
||||
Done = Errno(101) // /* sqlite3_step() has finished executing */
|
||||
)
|
||||
|
||||
var errText = map[Errno]string {
|
||||
1: "SQL error or missing database",
|
||||
2: "Internal logic error in SQLite",
|
||||
3: "Access permission denied",
|
||||
4: "Callback routine requested an abort",
|
||||
5: "The database file is locked",
|
||||
6: "A table in the database is locked",
|
||||
7: "A malloc() failed",
|
||||
8: "Attempt to write a readonly database",
|
||||
9: "Operation terminated by sqlite3_interrupt()*/",
|
||||
10: "Some kind of disk I/O error occurred",
|
||||
11: "The database disk image is malformed",
|
||||
12: "NOT USED. Table or record not found",
|
||||
13: "Insertion failed because database is full",
|
||||
14: "Unable to open the database file",
|
||||
15: "NOT USED. Database lock protocol error",
|
||||
16: "Database is empty",
|
||||
17: "The database schema changed",
|
||||
18: "String or BLOB exceeds size limit",
|
||||
19: "Abort due to constraint violation",
|
||||
20: "Data type mismatch",
|
||||
21: "Library used incorrectly",
|
||||
22: "Uses OS features not supported on host",
|
||||
23: "Authorization denied",
|
||||
24: "Auxiliary database format error",
|
||||
25: "2nd parameter to sqlite3_bind out of range",
|
||||
26: "File opened that is not a database file",
|
||||
var errText = map[Errno]string{
|
||||
1: "SQL error or missing database",
|
||||
2: "Internal logic error in SQLite",
|
||||
3: "Access permission denied",
|
||||
4: "Callback routine requested an abort",
|
||||
5: "The database file is locked",
|
||||
6: "A table in the database is locked",
|
||||
7: "A malloc() failed",
|
||||
8: "Attempt to write a readonly database",
|
||||
9: "Operation terminated by sqlite3_interrupt()*/",
|
||||
10: "Some kind of disk I/O error occurred",
|
||||
11: "The database disk image is malformed",
|
||||
12: "NOT USED. Table or record not found",
|
||||
13: "Insertion failed because database is full",
|
||||
14: "Unable to open the database file",
|
||||
15: "NOT USED. Database lock protocol error",
|
||||
16: "Database is empty",
|
||||
17: "The database schema changed",
|
||||
18: "String or BLOB exceeds size limit",
|
||||
19: "Abort due to constraint violation",
|
||||
20: "Data type mismatch",
|
||||
21: "Library used incorrectly",
|
||||
22: "Uses OS features not supported on host",
|
||||
23: "Authorization denied",
|
||||
24: "Auxiliary database format error",
|
||||
25: "2nd parameter to sqlite3_bind out of range",
|
||||
26: "File opened that is not a database file",
|
||||
100: "sqlite3_step() has another row ready",
|
||||
101: "sqlite3_step() has finished executing",
|
||||
}
|
||||
|
||||
func (c *Conn) error(rv C.int) os.Error {
|
||||
func (c *Conn) error(rv C.int) error {
|
||||
if c == nil || c.db == nil {
|
||||
return os.NewError("nil sqlite database")
|
||||
return errors.New("nil sqlite database")
|
||||
}
|
||||
if rv == 0 {
|
||||
return nil
|
||||
}
|
||||
if rv == 21 { // misuse
|
||||
if rv == 21 { // misuse
|
||||
return Errno(rv)
|
||||
}
|
||||
return os.NewError(Errno(rv).String() + ": " + C.GoString(C.sqlite3_errmsg(c.db)))
|
||||
return errors.New(Errno(rv).Error() + ": " + C.GoString(C.sqlite3_errmsg(c.db)))
|
||||
}
|
||||
|
||||
type Conn struct {
|
||||
|
|
@ -124,33 +125,33 @@ type Conn struct {
|
|||
}
|
||||
|
||||
func Version() string {
|
||||
p := C.sqlite3_libversion();
|
||||
return C.GoString(p);
|
||||
p := C.sqlite3_libversion()
|
||||
return C.GoString(p)
|
||||
}
|
||||
|
||||
func Open(filename string) (*Conn, os.Error) {
|
||||
func Open(filename string) (*Conn, error) {
|
||||
if C.sqlite3_threadsafe() == 0 {
|
||||
return nil, os.NewError("sqlite library was not compiled for thread-safe operation")
|
||||
return nil, errors.New("sqlite library was not compiled for thread-safe operation")
|
||||
}
|
||||
|
||||
var db *C.sqlite3
|
||||
name := C.CString(filename)
|
||||
defer C.free(unsafe.Pointer(name))
|
||||
rv := C.sqlite3_open_v2(name, &db,
|
||||
C.SQLITE_OPEN_FULLMUTEX |
|
||||
C.SQLITE_OPEN_READWRITE |
|
||||
C.SQLITE_OPEN_CREATE,
|
||||
C.SQLITE_OPEN_FULLMUTEX|
|
||||
C.SQLITE_OPEN_READWRITE|
|
||||
C.SQLITE_OPEN_CREATE,
|
||||
nil)
|
||||
if rv != 0 {
|
||||
return nil, Errno(rv)
|
||||
}
|
||||
if db == nil {
|
||||
return nil, os.NewError("sqlite succeeded without returning a database")
|
||||
return nil, errors.New("sqlite succeeded without returning a database")
|
||||
}
|
||||
return &Conn{db}, nil
|
||||
}
|
||||
|
||||
func NewBackup(dst *Conn, dstTable string, src *Conn, srcTable string) (*Backup, os.Error) {
|
||||
func NewBackup(dst *Conn, dstTable string, src *Conn, srcTable string) (*Backup, error) {
|
||||
dname := C.CString(dstTable)
|
||||
sname := C.CString(srcTable)
|
||||
defer C.free(unsafe.Pointer(dname))
|
||||
|
|
@ -164,18 +165,18 @@ func NewBackup(dst *Conn, dstTable string, src *Conn, srcTable string) (*Backup,
|
|||
}
|
||||
|
||||
type Backup struct {
|
||||
sb *C.sqlite3_backup
|
||||
sb *C.sqlite3_backup
|
||||
dst, src *Conn
|
||||
}
|
||||
|
||||
func (b *Backup) Step(npage int) os.Error {
|
||||
func (b *Backup) Step(npage int) error {
|
||||
rv := C.sqlite3_backup_step(b.sb, C.int(npage))
|
||||
if rv == 0 || Errno(rv) == ErrBusy || Errno(rv) == ErrLocked {
|
||||
return nil
|
||||
}
|
||||
return Errno(rv)
|
||||
}
|
||||
|
||||
|
||||
type BackupStatus struct {
|
||||
Remaining int
|
||||
PageCount int
|
||||
|
|
@ -185,8 +186,8 @@ func (b *Backup) Status() BackupStatus {
|
|||
return BackupStatus{int(C.sqlite3_backup_remaining(b.sb)), int(C.sqlite3_backup_pagecount(b.sb))}
|
||||
}
|
||||
|
||||
func (b *Backup) Run(npage int, sleepNs int64, c chan<- BackupStatus) os.Error {
|
||||
var err os.Error
|
||||
func (b *Backup) Run(npage int, sleepNs int64, c chan<- BackupStatus) error {
|
||||
var err error
|
||||
for {
|
||||
err = b.Step(npage)
|
||||
if err != nil {
|
||||
|
|
@ -197,10 +198,10 @@ func (b *Backup) Run(npage int, sleepNs int64, c chan<- BackupStatus) os.Error {
|
|||
}
|
||||
time.Sleep(sleepNs)
|
||||
}
|
||||
return b.dst.error(C.sqlite3_errcode(b.dst.db))
|
||||
return b.dst.error(C.sqlite3_errcode(b.dst.db))
|
||||
}
|
||||
|
||||
func (b *Backup) Close() os.Error {
|
||||
func (b *Backup) Close() error {
|
||||
if b.sb == nil {
|
||||
return os.EINVAL
|
||||
}
|
||||
|
|
@ -209,7 +210,7 @@ func (b *Backup) Close() os.Error {
|
|||
return nil
|
||||
}
|
||||
|
||||
func (c *Conn) BusyTimeout(ms int) os.Error {
|
||||
func (c *Conn) BusyTimeout(ms int) error {
|
||||
rv := C.sqlite3_busy_timeout(c.db, C.int(ms))
|
||||
if rv == 0 {
|
||||
return nil
|
||||
|
|
@ -217,7 +218,7 @@ func (c *Conn) BusyTimeout(ms int) os.Error {
|
|||
return Errno(rv)
|
||||
}
|
||||
|
||||
func (c *Conn) Exec(cmd string, args ...interface{}) os.Error {
|
||||
func (c *Conn) Exec(cmd string, args ...interface{}) error {
|
||||
s, err := c.Prepare(cmd)
|
||||
if err != nil {
|
||||
return err
|
||||
|
|
@ -235,17 +236,17 @@ func (c *Conn) Exec(cmd string, args ...interface{}) os.Error {
|
|||
}
|
||||
|
||||
type Stmt struct {
|
||||
c *Conn
|
||||
c *Conn
|
||||
stmt *C.sqlite3_stmt
|
||||
err os.Error
|
||||
t0 int64
|
||||
sql string
|
||||
err error
|
||||
t0 int64
|
||||
sql string
|
||||
args string
|
||||
}
|
||||
|
||||
func (c *Conn) Prepare(cmd string) (*Stmt, os.Error) {
|
||||
func (c *Conn) Prepare(cmd string) (*Stmt, error) {
|
||||
if c == nil || c.db == nil {
|
||||
return nil, os.NewError("nil sqlite database")
|
||||
return nil, errors.New("nil sqlite database")
|
||||
}
|
||||
cmdstr := C.CString(cmd)
|
||||
defer C.free(unsafe.Pointer(cmdstr))
|
||||
|
|
@ -258,7 +259,7 @@ func (c *Conn) Prepare(cmd string) (*Stmt, os.Error) {
|
|||
return &Stmt{c: c, stmt: stmt, sql: cmd, t0: time.Nanoseconds()}, nil
|
||||
}
|
||||
|
||||
func (s *Stmt) Exec(args ...interface{}) os.Error {
|
||||
func (s *Stmt) Exec(args ...interface{}) error {
|
||||
s.args = fmt.Sprintf(" %v", []interface{}(args))
|
||||
rv := C.sqlite3_reset(s.stmt)
|
||||
if rv != 0 {
|
||||
|
|
@ -267,7 +268,7 @@ func (s *Stmt) Exec(args ...interface{}) os.Error {
|
|||
|
||||
n := int(C.sqlite3_bind_parameter_count(s.stmt))
|
||||
if n != len(args) {
|
||||
return os.NewError(fmt.Sprintf("incorrect argument count for Stmt.Exec: have %d want %d", len(args), n))
|
||||
return errors.New(fmt.Sprintf("incorrect argument count for Stmt.Exec: have %d want %d", len(args), n))
|
||||
}
|
||||
|
||||
for i, v := range args {
|
||||
|
|
@ -282,7 +283,7 @@ func (s *Stmt) Exec(args ...interface{}) os.Error {
|
|||
return s.c.error(rv)
|
||||
}
|
||||
continue
|
||||
|
||||
|
||||
case bool:
|
||||
if v {
|
||||
str = "1"
|
||||
|
|
@ -293,7 +294,7 @@ func (s *Stmt) Exec(args ...interface{}) os.Error {
|
|||
default:
|
||||
str = fmt.Sprint(v)
|
||||
}
|
||||
|
||||
|
||||
cstr := C.CString(str)
|
||||
rv := C.my_bind_text(s.stmt, C.int(i+1), cstr, C.int(len(str)))
|
||||
C.free(unsafe.Pointer(cstr))
|
||||
|
|
@ -304,7 +305,7 @@ func (s *Stmt) Exec(args ...interface{}) os.Error {
|
|||
return nil
|
||||
}
|
||||
|
||||
func (s *Stmt) Error() os.Error {
|
||||
func (s *Stmt) Error() error {
|
||||
return s.err
|
||||
}
|
||||
|
||||
|
|
@ -317,29 +318,29 @@ func (s *Stmt) Next() bool {
|
|||
if err != Done {
|
||||
s.err = s.c.error(rv)
|
||||
}
|
||||
return false
|
||||
return false
|
||||
}
|
||||
|
||||
func (s *Stmt) Reset() os.Error {
|
||||
func (s *Stmt) Reset() error {
|
||||
C.sqlite3_reset(s.stmt)
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *Stmt) Scan(args ...interface{}) os.Error {
|
||||
func (s *Stmt) Scan(args ...interface{}) error {
|
||||
n := int(C.sqlite3_column_count(s.stmt))
|
||||
if n != len(args) {
|
||||
return os.NewError(fmt.Sprintf("incorrect argument count for Stmt.Scan: have %d want %d", len(args), n))
|
||||
return errors.New(fmt.Sprintf("incorrect argument count for Stmt.Scan: have %d want %d", len(args), n))
|
||||
}
|
||||
|
||||
|
||||
for i, v := range args {
|
||||
n := C.sqlite3_column_bytes(s.stmt, C.int(i))
|
||||
p := C.sqlite3_column_blob(s.stmt, C.int(i))
|
||||
if p == nil && n > 0 {
|
||||
return os.NewError("got nil blob")
|
||||
return errors.New("got nil blob")
|
||||
}
|
||||
var data []byte
|
||||
if n > 0 {
|
||||
data = (*[1<<30]byte)(unsafe.Pointer(p))[0:n]
|
||||
data = (*[1 << 30]byte)(unsafe.Pointer(p))[0:n]
|
||||
}
|
||||
switch v := v.(type) {
|
||||
case *[]byte:
|
||||
|
|
@ -351,23 +352,23 @@ func (s *Stmt) Scan(args ...interface{}) os.Error {
|
|||
case *int:
|
||||
x, err := strconv.Atoi(string(data))
|
||||
if err != nil {
|
||||
return os.NewError("arg " + strconv.Itoa(i) + " as int: " + err.String())
|
||||
return errors.New("arg " + strconv.Itoa(i) + " as int: " + err.Error())
|
||||
}
|
||||
*v = x
|
||||
case *int64:
|
||||
x, err := strconv.Atoi64(string(data))
|
||||
if err != nil {
|
||||
return os.NewError("arg " + strconv.Itoa(i) + " as int64: " + err.String())
|
||||
return errors.New("arg " + strconv.Itoa(i) + " as int64: " + err.Error())
|
||||
}
|
||||
*v = x
|
||||
case *float64:
|
||||
x, err := strconv.Atof64(string(data))
|
||||
if err != nil {
|
||||
return os.NewError("arg " + strconv.Itoa(i) + " as float64: " + err.String())
|
||||
return errors.New("arg " + strconv.Itoa(i) + " as float64: " + err.Error())
|
||||
}
|
||||
*v = x
|
||||
default:
|
||||
return os.NewError("unsupported type in Scan: " + reflect.TypeOf(v).String())
|
||||
return errors.New("unsupported type in Scan: " + reflect.TypeOf(v).String())
|
||||
}
|
||||
}
|
||||
return nil
|
||||
|
|
@ -381,7 +382,7 @@ func (s *Stmt) Nanoseconds() int64 {
|
|||
return time.Nanoseconds() - s.t0
|
||||
}
|
||||
|
||||
func (s *Stmt) Finalize() os.Error {
|
||||
func (s *Stmt) Finalize() error {
|
||||
rv := C.sqlite3_finalize(s.stmt)
|
||||
if rv != 0 {
|
||||
return s.c.error(rv)
|
||||
|
|
@ -389,9 +390,9 @@ func (s *Stmt) Finalize() os.Error {
|
|||
return nil
|
||||
}
|
||||
|
||||
func (c *Conn) Close() os.Error {
|
||||
func (c *Conn) Close() error {
|
||||
if c == nil || c.db == nil {
|
||||
return os.NewError("nil sqlite database")
|
||||
return errors.New("nil sqlite database")
|
||||
}
|
||||
rv := C.sqlite3_close(c.db)
|
||||
if rv != 0 {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue