[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Guile-commits] 06/15: Remove scm_c_read_bytes_unlocked
From: |
Andy Wingo |
Subject: |
[Guile-commits] 06/15: Remove scm_c_read_bytes_unlocked |
Date: |
Tue, 26 Apr 2016 21:38:54 +0000 |
wingo pushed a commit to branch wip-port-refactor
in repository guile.
commit 9632b24c4d6ee24a4672cdf0907364d26adb4bd9
Author: Andy Wingo <address@hidden>
Date: Fri Apr 22 21:39:18 2016 +0200
Remove scm_c_read_bytes_unlocked
* libguile/ports.c (scm_c_read_bytes_unlocked): Remove internal
function.
---
libguile/ports.c | 18 ++----------------
1 file changed, 2 insertions(+), 16 deletions(-)
diff --git a/libguile/ports.c b/libguile/ports.c
index b466ed8..61f00ef 100644
--- a/libguile/ports.c
+++ b/libguile/ports.c
@@ -1486,8 +1486,8 @@ scm_i_read_unlocked (SCM port, SCM buf)
returns less than SIZE bytes if at end-of-file.
Warning: Doesn't update port line and column counts! */
-static size_t
-scm_c_read_bytes_unlocked (SCM port, SCM dst, size_t start, size_t count)
+size_t
+scm_c_read_bytes (SCM port, SCM dst, size_t start, size_t count)
#define FUNC_NAME "scm_c_read_bytes"
{
size_t to_read = count;
@@ -1584,20 +1584,6 @@ scm_c_read (SCM port, void *buffer, size_t size)
}
#undef FUNC_NAME
-size_t
-scm_c_read_bytes (SCM port, SCM dst, size_t start, size_t count)
-{
- scm_i_pthread_mutex_t *lock;
- size_t ret;
-
- scm_c_lock_port (port, &lock);
- ret = scm_c_read_bytes_unlocked (port, dst, start, count);
- if (lock)
- scm_i_pthread_mutex_unlock (lock);
-
- return ret;
-}
-
/* Update the line and column number of PORT after consumption of C. */
static inline void
update_port_lf (scm_t_wchar c, SCM port)
- [Guile-commits] branch wip-port-refactor updated (5a342f6 -> 15d5304), Andy Wingo, 2016/04/26
- [Guile-commits] 01/15: Refactor thread safety for %port-property, Andy Wingo, 2016/04/26
- [Guile-commits] 03/15: scm_c_read instead of scm_c_read_unlock, Andy Wingo, 2016/04/26
- [Guile-commits] 02/15: Refactor to internal get/peek-byte functions, Andy Wingo, 2016/04/26
- [Guile-commits] 04/15: Remove port rw_active field, Andy Wingo, 2016/04/26
- [Guile-commits] 08/15: Remove scm_unget_{byte,bytes}_unlocked, Andy Wingo, 2016/04/26
- [Guile-commits] 06/15: Remove scm_c_read_bytes_unlocked,
Andy Wingo <=
- [Guile-commits] 10/15: Remove locking in scm_end_input, Andy Wingo, 2016/04/26
- [Guile-commits] 05/15: Remove scm_flush_unlocked / scm_end_input_unlocked, Andy Wingo, 2016/04/26
- [Guile-commits] 11/15: Remove scm_fill_input_unlocked, Andy Wingo, 2016/04/26
- [Guile-commits] 09/15: scm_ungetc, scm_ungets instead of _unlocked variants, Andy Wingo, 2016/04/26
- [Guile-commits] 07/15: Replace scm_getc with scm_getc_unlocked, Andy Wingo, 2016/04/26
- [Guile-commits] 14/15: Remove scm_c_write_unlocked, Andy Wingo, 2016/04/26
- [Guile-commits] 15/15: scm_lfwrite, not scm_lfwrite_unlocked, Andy Wingo, 2016/04/26
- [Guile-commits] 12/15: Remove scm_putc_unlocked., Andy Wingo, 2016/04/26
- [Guile-commits] 13/15: Remove scm_puts_unlocked., Andy Wingo, 2016/04/26