diff options
| author | Andy Wingo <wingo@pobox.com> | 2013-01-15 15:05:40 +0100 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2013-01-15 16:32:52 +0100 |
| commit | d1b9f8ace937085e084e0d9afbbc5e2944141413 (patch) | |
| tree | e6f65b5d6d104d8b2af43410cd89b23b50560fa2 /libguile/vports.c | |
| parent | e2551947dd94bdd8ecde441b19884c4730d0ee3b (diff) | |
| download | guile-d1b9f8ace937085e084e0d9afbbc5e2944141413.tar.gz | |
Port encodings cannot be NULL
* libguile/ports.c (scm_c_read_unlocked, scm_ungetc_unlocked):
* libguile/read.c (scm_read_character):
* libguile/vports.c (sf_fill_input): Port encodings cannot be NULL any
more, now that encodings are canonicalized, so simplify these.
Diffstat (limited to 'libguile/vports.c')
| -rw-r--r-- | libguile/vports.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libguile/vports.c b/libguile/vports.c index 4ff13f2e8..a886e362e 100644 --- a/libguile/vports.c +++ b/libguile/vports.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995,1996,1998,1999,2000,2001, 2002, 2003, 2006, 2009, 2010, 2011 Free Software Foundation, Inc. +/* Copyright (C) 1995,1996,1998,1999,2000,2001, 2002, 2003, 2006, 2009, 2010, 2011, 2013 Free Software Foundation, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -94,7 +94,7 @@ sf_fill_input (SCM port) SCM_ASSERT (SCM_CHARP (ans), ans, SCM_ARG1, "sf_fill_input"); pt = SCM_PTAB_ENTRY (port); - if (pt->encoding == NULL) + if (pt->encoding_mode == SCM_PORT_ENCODING_MODE_LATIN1) { scm_t_port *pt = SCM_PTAB_ENTRY (port); |