diff --git a/lib/chibi/io.sld b/lib/chibi/io.sld index feae0e1d..84184322 100644 --- a/lib/chibi/io.sld +++ b/lib/chibi/io.sld @@ -8,7 +8,7 @@ make-null-output-port make-null-input-port make-broadcast-port make-concatenated-port make-generated-input-port make-filtered-output-port - make-filtered-input-port string-count + make-filtered-input-port string-count-chars open-input-bytevector open-output-bytevector get-output-bytevector string->utf8 utf8->string write-string write-u8 read-u8 peek-u8 send-file diff --git a/lib/chibi/io/io.scm b/lib/chibi/io/io.scm index a1bdfbd1..acb33a50 100644 --- a/lib/chibi/io/io.scm +++ b/lib/chibi/io/io.scm @@ -136,7 +136,7 @@ ((if (pair? res) (= 0 (car res)) #t) eof) (else - (port-line-set! in (+ (string-count #\newline (cadr res) 0) + (port-line-set! in (+ (string-count-chars #\newline (cadr res) 0) (port-line in))) (cadr res))))))) @@ -161,7 +161,7 @@ (error "string to small to read chars" str n)) (let* ((in (if (pair? o) (car o) (current-input-port))) (res (%read-string! str n in))) - (port-line-set! in (+ (string-count #\newline str 0 n) (port-line in))) + (port-line-set! in (+ (string-count-chars #\newline str 0 n) (port-line in))) res)) ;;> Sends the entire contents of a file or input port to an output port. diff --git a/lib/chibi/io/io.stub b/lib/chibi/io/io.stub index 04b239a1..818a9ccc 100644 --- a/lib/chibi/io/io.stub +++ b/lib/chibi/io/io.stub @@ -38,7 +38,7 @@ (define-c sexp (get-output-bytevector "sexp_get_output_bytevector") ((value ctx sexp) (value self sexp) sexp)) -(define-c sexp (string-count "sexp_string_count") +(define-c sexp (string-count-chars "sexp_string_count") ((value ctx sexp) (value self sexp) sexp sexp sexp (default NULL sexp))) (define-c sexp (%string->utf8 "sexp_string_to_utf8") ((value ctx sexp) (value self sexp) sexp))