Based on PR #1704 feedback, rename copy-buffer to trim-and-copy-buffer and

adjust `string-trim` to only perform right-wise trimming of the buffer.
This commit is contained in:
Alexander McLin 2017-06-20 14:08:44 -04:00 committed by Ryan Culpepper
parent dfd585db33
commit ed481865cf

View File

@ -60,8 +60,8 @@
;; -- Stmt -- ;; -- Stmt --
(define (copy-buffer buffer) (define (trim-and-copy-buffer buffer)
(let* ([buffer (string->bytes/utf-8 (string-trim buffer))] (let* ([buffer (string->bytes/utf-8 (string-trim #:left? #f buffer))]
[n (bytes-length buffer)] [n (bytes-length buffer)]
[rawcopy (malloc (add1 n) 'atomic-interior)] [rawcopy (malloc (add1 n) 'atomic-interior)]
[copy (make-sized-byte-string rawcopy n)]) [copy (make-sized-byte-string rawcopy n)])
@ -76,7 +76,7 @@
(define-sqlite sqlite3_prepare (define-sqlite sqlite3_prepare
(_fun (db sql) :: (_fun (db sql) ::
(db : _sqlite3_database) (db : _sqlite3_database)
(sql-buffer : _bytes = (copy-buffer sql)) (sql-buffer : _bytes = (trim-and-copy-buffer sql))
((bytes-length sql-buffer) : _int) ((bytes-length sql-buffer) : _int)
(statement : (_ptr o _sqlite3_statement/null)) (statement : (_ptr o _sqlite3_statement/null))
(tail : (_ptr o _gcpointer)) ;; points into sql-buffer (atomic-interior) (tail : (_ptr o _gcpointer)) ;; points into sql-buffer (atomic-interior)
@ -87,7 +87,7 @@
(define-sqlite sqlite3_prepare_v2 (define-sqlite sqlite3_prepare_v2
(_fun (db sql) :: (_fun (db sql) ::
(db : _sqlite3_database) (db : _sqlite3_database)
(sql-buffer : _bytes = (copy-buffer sql)) (sql-buffer : _bytes = (trim-and-copy-buffer sql))
((bytes-length sql-buffer) : _int) ((bytes-length sql-buffer) : _int)
;; bad prepare statements set statement to NULL, with no error reported ;; bad prepare statements set statement to NULL, with no error reported
(statement : (_ptr o _sqlite3_statement/null)) (statement : (_ptr o _sqlite3_statement/null))