Mercurial > hg > xemacs-beta
diff src/lstream.c @ 665:fdefd0186b75
[xemacs-hg @ 2001-09-20 06:28:42 by ben]
The great integral types renaming.
The purpose of this is to rationalize the names used for various
integral types, so that they match their intended uses and follow
consist conventions, and eliminate types that were not semantically
different from each other.
The conventions are:
-- All integral types that measure quantities of anything are
signed. Some people disagree vociferously with this, but their
arguments are mostly theoretical, and are vastly outweighed by
the practical headaches of mixing signed and unsigned values,
and more importantly by the far increased likelihood of
inadvertent bugs: Because of the broken "viral" nature of
unsigned quantities in C (operations involving mixed
signed/unsigned are done unsigned, when exactly the opposite is
nearly always wanted), even a single error in declaring a
quantity unsigned that should be signed, or even the even more
subtle error of comparing signed and unsigned values and
forgetting the necessary cast, can be catastrophic, as
comparisons will yield wrong results. -Wsign-compare is turned
on specifically to catch this, but this tends to result in a
great number of warnings when mixing signed and unsigned, and
the casts are annoying. More has been written on this
elsewhere.
-- All such quantity types just mentioned boil down to EMACS_INT,
which is 32 bits on 32-bit machines and 64 bits on 64-bit
machines. This is guaranteed to be the same size as Lisp
objects of type `int', and (as far as I can tell) of size_t
(unsigned!) and ssize_t. The only type below that is not an
EMACS_INT is Hashcode, which is an unsigned value of the same
size as EMACS_INT.
-- Type names should be relatively short (no more than 10
characters or so), with the first letter capitalized and no
underscores if they can at all be avoided.
-- "count" == a zero-based measurement of some quantity. Includes
sizes, offsets, and indexes.
-- "bpos" == a one-based measurement of a position in a buffer.
"Charbpos" and "Bytebpos" count text in the buffer, rather than
bytes in memory; thus Bytebpos does not directly correspond to
the memory representation. Use "Membpos" for this.
-- "Char" refers to internal-format characters, not to the C type
"char", which is really a byte.
-- For the actual name changes, see the script below.
I ran the following script to do the conversion. (NOTE: This script
is idempotent. You can safely run it multiple times and it will
not screw up previous results -- in fact, it will do nothing if
nothing has changed. Thus, it can be run repeatedly as necessary
to handle patches coming in from old workspaces, or old branches.)
There are two tags, just before and just after the change:
`pre-integral-type-rename' and `post-integral-type-rename'. When
merging code from the main trunk into a branch, the best thing to
do is first merge up to `pre-integral-type-rename', then apply the
script and associated changes, then merge from
`post-integral-type-change' to the present. (Alternatively, just do
the merging in one operation; but you may then have a lot of
conflicts needing to be resolved by hand.)
Script `fixtypes.sh' follows:
----------------------------------- cut ------------------------------------
files="*.[ch] s/*.h m/*.h config.h.in ../configure.in Makefile.in.in ../lib-src/*.[ch] ../lwlib/*.[ch]"
gr Memory_Count Bytecount $files
gr Lstream_Data_Count Bytecount $files
gr Element_Count Elemcount $files
gr Hash_Code Hashcode $files
gr extcount bytecount $files
gr bufpos charbpos $files
gr bytind bytebpos $files
gr memind membpos $files
gr bufbyte intbyte $files
gr Extcount Bytecount $files
gr Bufpos Charbpos $files
gr Bytind Bytebpos $files
gr Memind Membpos $files
gr Bufbyte Intbyte $files
gr EXTCOUNT BYTECOUNT $files
gr BUFPOS CHARBPOS $files
gr BYTIND BYTEBPOS $files
gr MEMIND MEMBPOS $files
gr BUFBYTE INTBYTE $files
gr MEMORY_COUNT BYTECOUNT $files
gr LSTREAM_DATA_COUNT BYTECOUNT $files
gr ELEMENT_COUNT ELEMCOUNT $files
gr HASH_CODE HASHCODE $files
----------------------------------- cut ------------------------------------
`fixtypes.sh' is a Bourne-shell script; it uses 'gr':
----------------------------------- cut ------------------------------------
#!/bin/sh
# Usage is like this:
# gr FROM TO FILES ...
# globally replace FROM with TO in FILES. FROM and TO are regular expressions.
# backup files are stored in the `backup' directory.
from="$1"
to="$2"
shift 2
echo ${1+"$@"} | xargs global-replace "s/$from/$to/g"
----------------------------------- cut ------------------------------------
`gr' in turn uses a Perl script to do its real work,
`global-replace', which follows:
----------------------------------- cut ------------------------------------
: #-*- Perl -*-
### global-modify --- modify the contents of a file by a Perl expression
## Copyright (C) 1999 Martin Buchholz.
## Copyright (C) 2001 Ben Wing.
## Authors: Martin Buchholz <martin@xemacs.org>, Ben Wing <ben@xemacs.org>
## Maintainer: Ben Wing <ben@xemacs.org>
## Current Version: 1.0, May 5, 2001
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with XEmacs; see the file COPYING. If not, write to the Free
# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
eval 'exec perl -w -S $0 ${1+"$@"}'
if 0;
use strict;
use FileHandle;
use Carp;
use Getopt::Long;
use File::Basename;
(my $myName = $0) =~ s@.*/@@; my $usage="
Usage: $myName [--help] [--backup-dir=DIR] [--line-mode] [--hunk-mode]
PERLEXPR FILE ...
Globally modify a file, either line by line or in one big hunk.
Typical usage is like this:
[with GNU print, GNU xargs: guaranteed to handle spaces, quotes, etc.
in file names]
find . -name '*.[ch]' -print0 | xargs -0 $0 's/\bCONST\b/const/g'\n
[with non-GNU print, xargs]
find . -name '*.[ch]' -print | xargs $0 's/\bCONST\b/const/g'\n
The file is read in, either line by line (with --line-mode specified)
or in one big hunk (with --hunk-mode specified; it's the default), and
the Perl expression is then evalled with \$_ set to the line or hunk of
text, including the terminating newline if there is one. It should
destructively modify the value there, storing the changed result in \$_.
Files in which any modifications are made are backed up to the directory
specified using --backup-dir, or to `backup' by default. To disable this,
use --backup-dir= with no argument.
Hunk mode is the default because it is MUCH MUCH faster than line-by-line.
Use line-by-line only when it matters, e.g. you want to do a replacement
only once per line (the default without the `g' argument). Conversely,
when using hunk mode, *ALWAYS* use `g'; otherwise, you will only make one
replacement in the entire file!
";
my %options = ();
$Getopt::Long::ignorecase = 0;
&GetOptions (
\%options,
'help', 'backup-dir=s', 'line-mode', 'hunk-mode',
);
die $usage if $options{"help"} or @ARGV <= 1;
my $code = shift;
die $usage if grep (-d || ! -w, @ARGV);
sub SafeOpen {
open ((my $fh = new FileHandle), $_[0]);
confess "Can't open $_[0]: $!" if ! defined $fh;
return $fh;
}
sub SafeClose {
close $_[0] or confess "Can't close $_[0]: $!";
}
sub FileContents {
my $fh = SafeOpen ("< $_[0]");
my $olddollarslash = $/;
local $/ = undef;
my $contents = <$fh>;
$/ = $olddollarslash;
return $contents;
}
sub WriteStringToFile {
my $fh = SafeOpen ("> $_[0]");
binmode $fh;
print $fh $_[1] or confess "$_[0]: $!\n";
SafeClose $fh;
}
foreach my $file (@ARGV) {
my $changed_p = 0;
my $new_contents = "";
if ($options{"line-mode"}) {
my $fh = SafeOpen $file;
while (<$fh>) {
my $save_line = $_;
eval $code;
$changed_p = 1 if $save_line ne $_;
$new_contents .= $_;
}
} else {
my $orig_contents = $_ = FileContents $file;
eval $code;
if ($_ ne $orig_contents) {
$changed_p = 1;
$new_contents = $_;
}
}
if ($changed_p) {
my $backdir = $options{"backup-dir"};
$backdir = "backup" if !defined ($backdir);
if ($backdir) {
my ($name, $path, $suffix) = fileparse ($file, "");
my $backfulldir = $path . $backdir;
my $backfile = "$backfulldir/$name";
mkdir $backfulldir, 0755 unless -d $backfulldir;
print "modifying $file (original saved in $backfile)\n";
rename $file, $backfile;
}
WriteStringToFile ($file, $new_contents);
}
}
----------------------------------- cut ------------------------------------
In addition to those programs, I needed to fix up a few other
things, particularly relating to the duplicate definitions of
types, now that some types merged with others. Specifically:
1. in lisp.h, removed duplicate declarations of Bytecount. The
changed code should now look like this: (In each code snippet
below, the first and last lines are the same as the original, as
are all lines outside of those lines. That allows you to locate
the section to be replaced, and replace the stuff in that
section, verifying that there isn't anything new added that
would need to be kept.)
--------------------------------- snip -------------------------------------
/* Counts of bytes or chars */
typedef EMACS_INT Bytecount;
typedef EMACS_INT Charcount;
/* Counts of elements */
typedef EMACS_INT Elemcount;
/* Hash codes */
typedef unsigned long Hashcode;
/* ------------------------ dynamic arrays ------------------- */
--------------------------------- snip -------------------------------------
2. in lstream.h, removed duplicate declaration of Bytecount.
Rewrote the comment about this type. The changed code should
now look like this:
--------------------------------- snip -------------------------------------
#endif
/* The have been some arguments over the what the type should be that
specifies a count of bytes in a data block to be written out or read in,
using Lstream_read(), Lstream_write(), and related functions.
Originally it was long, which worked fine; Martin "corrected" these to
size_t and ssize_t on the grounds that this is theoretically cleaner and
is in keeping with the C standards. Unfortunately, this practice is
horribly error-prone due to design flaws in the way that mixed
signed/unsigned arithmetic happens. In fact, by doing this change,
Martin introduced a subtle but fatal error that caused the operation of
sending large mail messages to the SMTP server under Windows to fail.
By putting all values back to be signed, avoiding any signed/unsigned
mixing, the bug immediately went away. The type then in use was
Lstream_Data_Count, so that it be reverted cleanly if a vote came to
that. Now it is Bytecount.
Some earlier comments about why the type must be signed: This MUST BE
SIGNED, since it also is used in functions that return the number of
bytes actually read to or written from in an operation, and these
functions can return -1 to signal error.
Note that the standard Unix read() and write() functions define the
count going in as a size_t, which is UNSIGNED, and the count going
out as an ssize_t, which is SIGNED. This is a horrible design
flaw. Not only is it highly likely to lead to logic errors when a
-1 gets interpreted as a large positive number, but operations are
bound to fail in all sorts of horrible ways when a number in the
upper-half of the size_t range is passed in -- this number is
unrepresentable as an ssize_t, so code that checks to see how many
bytes are actually written (which is mandatory if you are dealing
with certain types of devices) will get completely screwed up.
--ben
*/
typedef enum lstream_buffering
--------------------------------- snip -------------------------------------
3. in dumper.c, there are four places, all inside of switch()
statements, where XD_BYTECOUNT appears twice as a case tag. In
each case, the two case blocks contain identical code, and you
should *REMOVE THE SECOND* and leave the first.
| author | ben |
|---|---|
| date | Thu, 20 Sep 2001 06:31:11 +0000 |
| parents | b39c14581166 |
| children | 943eaba38521 |
line wrap: on
line diff
--- a/src/lstream.c Tue Sep 18 05:06:57 2001 +0000 +++ b/src/lstream.c Thu Sep 20 06:31:11 2001 +0000 @@ -95,19 +95,19 @@ void Lstream_fungetc (Lstream *stream, int c) Function equivalents of the above macros. -Lstream_Data_Count Lstream_read (Lstream *stream, void *data, - Lstream_Data_Count size) +Bytecount Lstream_read (Lstream *stream, void *data, + Bytecount size) Read SIZE bytes of DATA from the stream. Return the number of bytes read. 0 means EOF. -1 means an error occurred and no bytes were read. -Lstream_Data_Count Lstream_write (Lstream *stream, void *data, - Lstream_Data_Count size) +Bytecount Lstream_write (Lstream *stream, void *data, + Bytecount size) Write SIZE bytes of DATA to the stream. Return the number of bytes written. -1 means an error occurred and no bytes were written. -void Lstream_unread (Lstream *stream, void *data, Lstream_Data_Count size) +void Lstream_unread (Lstream *stream, void *data, Bytecount size) Push back SIZE bytes of DATA onto the input queue. The next call to Lstream_read() with the same size will read the same bytes back. Note that this will be the case even if @@ -181,14 +181,14 @@ } } -inline static Memory_Count -aligned_sizeof_lstream (Memory_Count lstream_type_specific_size) +inline static Bytecount +aligned_sizeof_lstream (Bytecount lstream_type_specific_size) { return ALIGN_SIZE (offsetof (Lstream, data) + lstream_type_specific_size, ALIGNOF (max_align_t)); } -static Memory_Count +static Bytecount sizeof_lstream (const void *header) { return aligned_sizeof_lstream (((const Lstream *) header)->imp->size); @@ -303,11 +303,11 @@ int Lstream_flush_out (Lstream *lstr) { - Lstream_Data_Count num_written; + Bytecount num_written; while (lstr->out_buffer_ind > 0) { - Lstream_Data_Count size = lstr->out_buffer_ind; + Bytecount size = lstr->out_buffer_ind; if (! (lstr->flags & LSTREAM_FL_IS_OPEN)) Lstream_internal_error ("lstream not open", lstr); if (! (lstr->flags & LSTREAM_FL_WRITE)) @@ -390,10 +390,10 @@ if it's getting EWOULDBLOCK errors. We have to keep stocking them up until they can be written, so as to avoid losing data. */ -static Lstream_Data_Count -Lstream_adding (Lstream *lstr, Lstream_Data_Count num, int force) +static Bytecount +Lstream_adding (Lstream *lstr, Bytecount num, int force) { - Lstream_Data_Count size = num + lstr->out_buffer_ind; + Bytecount size = num + lstr->out_buffer_ind; if (size <= lstr->out_buffer_size) return num; @@ -415,11 +415,11 @@ /* Like Lstream_write(), but does not handle line-buffering correctly. */ -static Lstream_Data_Count -Lstream_write_1 (Lstream *lstr, const void *data, Lstream_Data_Count size) +static Bytecount +Lstream_write_1 (Lstream *lstr, const void *data, Bytecount size) { const unsigned char *p = (const unsigned char *) data; - Lstream_Data_Count off = 0; + Bytecount off = 0; if (! (lstr->flags & LSTREAM_FL_IS_OPEN)) Lstream_internal_error ("lstream not open", lstr); if (! (lstr->flags & LSTREAM_FL_WRITE)) @@ -430,7 +430,7 @@ while (1) { /* Figure out how much we can add to the buffer */ - Lstream_Data_Count chunk = Lstream_adding (lstr, size, 0); + Bytecount chunk = Lstream_adding (lstr, size, 0); if (chunk == 0) { if (couldnt_write_last_time) @@ -475,10 +475,10 @@ repeatedly call Lstream_putc(), which knows how to handle line buffering. Returns number of bytes written. */ -Lstream_Data_Count -Lstream_write (Lstream *lstr, const void *data, Lstream_Data_Count size) +Bytecount +Lstream_write (Lstream *lstr, const void *data, Bytecount size) { - Lstream_Data_Count i; + Bytecount i; const unsigned char *p = (const unsigned char *) data; if (size == 0) @@ -499,9 +499,9 @@ return lstr->imp->was_blocked_p ? lstr->imp->was_blocked_p (lstr) : 0; } -static Lstream_Data_Count +static Bytecount Lstream_raw_read (Lstream *lstr, unsigned char *buffer, - Lstream_Data_Count size) + Bytecount size) { if (! (lstr->flags & LSTREAM_FL_IS_OPEN)) Lstream_internal_error ("lstream not open", lstr); @@ -515,18 +515,18 @@ /* Assuming the buffer is empty, fill it up again. */ -static Lstream_Data_Count +static Bytecount Lstream_read_more (Lstream *lstr) { #if 0 - Lstream_Data_Count size_needed + Bytecount size_needed = max (1, min (MAX_READ_SIZE, lstr->buffering_size)); #else /* If someone requested a larger buffer size, so be it! */ - Lstream_Data_Count size_needed = + Bytecount size_needed = max (1, lstr->buffering_size); #endif - Lstream_Data_Count size_gotten; + Bytecount size_gotten; DO_REALLOC (lstr->in_buffer, lstr->in_buffer_size, size_needed, unsigned char); @@ -536,12 +536,12 @@ return size_gotten < 0 ? -1 : size_gotten; } -Lstream_Data_Count -Lstream_read (Lstream *lstr, void *data, Lstream_Data_Count size) +Bytecount +Lstream_read (Lstream *lstr, void *data, Bytecount size) { unsigned char *p = (unsigned char *) data; - Lstream_Data_Count off = 0; - Lstream_Data_Count chunk; + Bytecount off = 0; + Bytecount chunk; int error_occurred = 0; if (size == 0) @@ -574,7 +574,7 @@ /* If we need some more, try to get some more from the stream's end */ if (size > 0) { - Lstream_Data_Count retval = Lstream_read_more (lstr); + Bytecount retval = Lstream_read_more (lstr); if (retval < 0) error_occurred = 1; if (retval <= 0) @@ -598,7 +598,7 @@ VALIDATE_CHARPTR_BACKWARD (dataend); if (dataend + REP_BYTES_BY_FIRST_BYTE (*dataend) != p + off) { - Lstream_Data_Count newoff = dataend - p; + Bytecount newoff = dataend - p; /* If not, chop the size down to ignore the last char and stash it away for next time. */ Lstream_unread (lstr, dataend, off - newoff); @@ -611,7 +611,7 @@ } void -Lstream_unread (Lstream *lstr, const void *data, Lstream_Data_Count size) +Lstream_unread (Lstream *lstr, const void *data, Bytecount size) { const unsigned char *p = (const unsigned char *) data; @@ -730,7 +730,7 @@ Lstream_fputc (Lstream *lstr, int c) { unsigned char ch = (unsigned char) c; - Lstream_Data_Count retval = Lstream_write_1 (lstr, &ch, 1); + Bytecount retval = Lstream_write_1 (lstr, &ch, 1); if (retval >= 0 && lstr->buffering == LSTREAM_LINE_BUFFERED && ch == '\n') return Lstream_flush_out (lstr); return retval < 0 ? -1 : 0; @@ -811,22 +811,22 @@ code (it could even be argued that the error might have fixed itself, so we should do the fread() again. */ -static Lstream_Data_Count -stdio_reader (Lstream *stream, unsigned char *data, Lstream_Data_Count size) +static Bytecount +stdio_reader (Lstream *stream, unsigned char *data, Bytecount size) { struct stdio_stream *str = STDIO_STREAM_DATA (stream); - Lstream_Data_Count val = fread (data, 1, size, str->file); + Bytecount val = fread (data, 1, size, str->file); if (!val && ferror (str->file)) return -1; return val; } -static Lstream_Data_Count +static Bytecount stdio_writer (Lstream *stream, const unsigned char *data, - Lstream_Data_Count size) + Bytecount size) { struct stdio_stream *str = STDIO_STREAM_DATA (stream); - Lstream_Data_Count val = fwrite (data, 1, size, str->file); + Bytecount val = fwrite (data, 1, size, str->file); if (!val && ferror (str->file)) return -1; return val; @@ -879,7 +879,7 @@ { int fd; int pty_max_bytes; - Bufbyte eof_char; + Intbyte eof_char; int starting_pos; int current_pos; int end_pos; @@ -937,13 +937,13 @@ return make_filedesc_stream_1 (filedesc, offset, count, flags, "w"); } -static Lstream_Data_Count -filedesc_reader (Lstream *stream, unsigned char *data, Lstream_Data_Count size) +static Bytecount +filedesc_reader (Lstream *stream, unsigned char *data, Bytecount size) { - Lstream_Data_Count nread; + Bytecount nread; struct filedesc_stream *str = FILEDESC_STREAM_DATA (stream); if (str->end_pos >= 0) - size = min (size, (Lstream_Data_Count) (str->end_pos - str->current_pos)); + size = min (size, (Bytecount) (str->end_pos - str->current_pos)); nread = str->allow_quit ? read_allowing_quit (str->fd, data, size) : read (str->fd, data, size); @@ -966,12 +966,12 @@ return 0; } -static Lstream_Data_Count +static Bytecount filedesc_writer (Lstream *stream, const unsigned char *data, - Lstream_Data_Count size) + Bytecount size) { struct filedesc_stream *str = FILEDESC_STREAM_DATA (stream); - Lstream_Data_Count retval; + Bytecount retval; int need_newline = 0; /* This function would be simple if it were not for the blasted @@ -1025,7 +1025,7 @@ out for EWOULDBLOCK. */ if (str->chars_sans_newline >= str->pty_max_bytes) { - Lstream_Data_Count retval2 = str->allow_quit ? + Bytecount retval2 = str->allow_quit ? write_allowing_quit (str->fd, &str->eof_char, 1) : write (str->fd, &str->eof_char, 1); @@ -1057,8 +1057,8 @@ in pty-flushing mode. */ if (need_newline) { - Bufbyte nl = '\n'; - Lstream_Data_Count retval2 = str->allow_quit ? + Intbyte nl = '\n'; + Bytecount retval2 = str->allow_quit ? write_allowing_quit (str->fd, &nl, 1) : write (str->fd, &nl, 1); @@ -1140,7 +1140,7 @@ void filedesc_stream_set_pty_flushing (Lstream *stream, int pty_max_bytes, - Bufbyte eof_char) + Intbyte eof_char) { struct filedesc_stream *str = FILEDESC_STREAM_DATA (stream); str->pty_max_bytes = pty_max_bytes; @@ -1194,15 +1194,15 @@ return obj; } -static Lstream_Data_Count +static Bytecount lisp_string_reader (Lstream *stream, unsigned char *data, - Lstream_Data_Count size) + Bytecount size) { struct lisp_string_stream *str = LISP_STRING_STREAM_DATA (stream); /* Don't lose if the string shrank past us ... */ Bytecount offset = min (str->offset, XSTRING_LENGTH (str->obj)); - Bufbyte *strstart = XSTRING_DATA (str->obj); - Bufbyte *start = strstart + offset; + Intbyte *strstart = XSTRING_DATA (str->obj); + Intbyte *start = strstart + offset; /* ... or if someone changed the string and we ended up in the middle of a character. */ @@ -1211,7 +1211,7 @@ if (stream->flags & LSTREAM_FL_NO_PARTIAL_CHARS) VALIDATE_CHARPTR_BACKWARD (start); offset = start - strstart; - size = min (size, (Lstream_Data_Count) (str->end - offset)); + size = min (size, (Bytecount) (str->end - offset)); memcpy (data, start, size); str->offset = offset + size; return size; @@ -1229,8 +1229,8 @@ /* ... or if someone changed the string and we ended up in the middle of a character. */ { - Bufbyte *strstart = XSTRING_DATA (str->obj); - Bufbyte *start = strstart + pos; + Intbyte *strstart = XSTRING_DATA (str->obj); + Intbyte *start = strstart + pos; VALIDATE_CHARPTR_BACKWARD (start); pos = start - strstart; } @@ -1254,15 +1254,15 @@ { const unsigned char *inbuf; unsigned char *outbuf; - Lstream_Data_Count size; - Lstream_Data_Count offset; + Bytecount size; + Bytecount offset; }; DEFINE_LSTREAM_IMPLEMENTATION ("fixed-buffer", lstream_fixed_buffer, sizeof (struct fixed_buffer_stream)); Lisp_Object -make_fixed_buffer_input_stream (const void *buf, Lstream_Data_Count size) +make_fixed_buffer_input_stream (const void *buf, Bytecount size) { Lisp_Object obj; Lstream *lstr = Lstream_new (lstream_fixed_buffer, "r"); @@ -1274,7 +1274,7 @@ } Lisp_Object -make_fixed_buffer_output_stream (void *buf, Lstream_Data_Count size) +make_fixed_buffer_output_stream (void *buf, Bytecount size) { Lisp_Object obj; Lstream *lstr = Lstream_new (lstream_fixed_buffer, "w"); @@ -1285,9 +1285,9 @@ return obj; } -static Lstream_Data_Count +static Bytecount fixed_buffer_reader (Lstream *stream, unsigned char *data, - Lstream_Data_Count size) + Bytecount size) { struct fixed_buffer_stream *str = FIXED_BUFFER_STREAM_DATA (stream); size = min (size, str->size - str->offset); @@ -1296,9 +1296,9 @@ return size; } -static Lstream_Data_Count +static Bytecount fixed_buffer_writer (Lstream *stream, const unsigned char *data, - Lstream_Data_Count size) + Bytecount size) { struct fixed_buffer_stream *str = FIXED_BUFFER_STREAM_DATA (stream); if (str->offset == str->size) @@ -1343,7 +1343,7 @@ struct resizing_buffer_stream { unsigned char *buf; - Lstream_Data_Count allocked; + Bytecount allocked; int max_stored; int stored; }; @@ -1359,9 +1359,9 @@ return obj; } -static Lstream_Data_Count +static Bytecount resizing_buffer_writer (Lstream *stream, const unsigned char *data, - Lstream_Data_Count size) + Bytecount size) { struct resizing_buffer_stream *str = RESIZING_BUFFER_STREAM_DATA (stream); DO_REALLOC (str->buf, str->allocked, str->stored + size, unsigned char); @@ -1400,7 +1400,7 @@ /* Note: If you have a dynarr whose type is not unsigned_char_dynarr but which is really just an unsigned_char_dynarr (e.g. its type - is Bufbyte or Extbyte), just cast to unsigned_char_dynarr. */ + is Intbyte or Extbyte), just cast to unsigned_char_dynarr. */ #define DYNARR_STREAM_DATA(stream) \ LSTREAM_TYPE_DATA (stream, dynarr) @@ -1422,9 +1422,9 @@ return obj; } -static Lstream_Data_Count +static Bytecount dynarr_writer (Lstream *stream, const unsigned char *data, - Lstream_Data_Count size) + Bytecount size) { struct dynarr_stream *str = DYNARR_STREAM_DATA (stream); Dynarr_add_many (str->dyn, data, size); @@ -1466,13 +1466,13 @@ sizeof (struct lisp_buffer_stream)); static Lisp_Object -make_lisp_buffer_stream_1 (struct buffer *buf, Bufpos start, Bufpos end, +make_lisp_buffer_stream_1 (struct buffer *buf, Charbpos start, Charbpos end, int flags, const char *mode) { Lisp_Object obj; Lstream *lstr; struct lisp_buffer_stream *str; - Bufpos bmin, bmax; + Charbpos bmin, bmax; int reading = !strcmp (mode, "r"); /* Make sure the luser didn't pass "w" in. */ @@ -1532,14 +1532,14 @@ } Lisp_Object -make_lisp_buffer_input_stream (struct buffer *buf, Bufpos start, Bufpos end, +make_lisp_buffer_input_stream (struct buffer *buf, Charbpos start, Charbpos end, int flags) { return make_lisp_buffer_stream_1 (buf, start, end, flags, "r"); } Lisp_Object -make_lisp_buffer_output_stream (struct buffer *buf, Bufpos pos, int flags) +make_lisp_buffer_output_stream (struct buffer *buf, Charbpos pos, int flags) { Lisp_Object lstr = make_lisp_buffer_stream_1 (buf, pos, 0, flags, "wc"); @@ -1547,40 +1547,40 @@ return lstr; } -static Lstream_Data_Count +static Bytecount lisp_buffer_reader (Lstream *stream, unsigned char *data, - Lstream_Data_Count size) + Bytecount size) { struct lisp_buffer_stream *str = LISP_BUFFER_STREAM_DATA (stream); unsigned char *orig_data = data; - Bytind start; - Bytind end; + Bytebpos start; + Bytebpos end; struct buffer *buf = XBUFFER (str->buffer); if (!BUFFER_LIVE_P (buf)) return 0; /* Fut. */ - /* NOTE: We do all our operations in Bytind's. + /* NOTE: We do all our operations in Bytebpos's. Keep in mind that SIZE is a value in bytes, not chars. */ start = bi_marker_position (str->start); end = bi_marker_position (str->end); if (!(str->flags & LSTR_IGNORE_ACCESSIBLE)) { - start = bytind_clip_to_bounds (BI_BUF_BEGV (buf), start, + start = bytebpos_clip_to_bounds (BI_BUF_BEGV (buf), start, BI_BUF_ZV (buf)); - end = bytind_clip_to_bounds (BI_BUF_BEGV (buf), end, + end = bytebpos_clip_to_bounds (BI_BUF_BEGV (buf), end, BI_BUF_ZV (buf)); } - size = min (size, (Lstream_Data_Count) (end - start)); + size = min (size, (Bytecount) (end - start)); end = start + size; /* We cannot return a partial character. */ - VALIDATE_BYTIND_BACKWARD (buf, end); + VALIDATE_BYTEBPOS_BACKWARD (buf, end); while (start < end) { - Bytind ceil; + Bytebpos ceil; Bytecount chunk; if (str->flags & LSTR_IGNORE_ACCESSIBLE) @@ -1606,12 +1606,12 @@ return data - orig_data; } -static Lstream_Data_Count +static Bytecount lisp_buffer_writer (Lstream *stream, const unsigned char *data, - Lstream_Data_Count size) + Bytecount size) { struct lisp_buffer_stream *str = LISP_BUFFER_STREAM_DATA (stream); - Bufpos pos; + Charbpos pos; struct buffer *buf = XBUFFER (str->buffer); if (!BUFFER_LIVE_P (buf)) @@ -1653,7 +1653,7 @@ return str->buffer; } -Bufpos +Charbpos lisp_buffer_stream_startpos (Lstream *stream) { return marker_position (LISP_BUFFER_STREAM_DATA (stream)->start);