[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r114690: bool vector int width fixes
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] trunk r114690: bool vector int width fixes |
Date: |
Thu, 17 Oct 2013 01:02:37 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 114690
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Wed 2013-10-16 18:02:32 -0700
message:
bool vector int width fixes
* data.c (bool_vector_spare_mask, Fbool_vector_count_matches)
(Fbool_vector_count_matches_at):
Use EMACS_INT, not ptrdiff_t, to record bit counts, as a bit count
can exceed PTRDIFF_MAX, at least in theory.
(Fbool_vector_count_matches_at):
Use int, not ptrdiff_t, to record a value that can't exceed INT_MAX.
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/data.c data.c-20091113204419-o5vbwnq5f7feedwu-251
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2013-10-16 17:36:04 +0000
+++ b/src/ChangeLog 2013-10-17 01:02:32 +0000
@@ -1,3 +1,13 @@
+2013-10-17 Paul Eggert <address@hidden>
+
+ bool vector int width fixes
+ * data.c (bool_vector_spare_mask, Fbool_vector_count_matches)
+ (Fbool_vector_count_matches_at):
+ Use EMACS_INT, not ptrdiff_t, to record bit counts, as a bit count
+ can exceed PTRDIFF_MAX, at least in theory.
+ (Fbool_vector_count_matches_at):
+ Use int, not ptrdiff_t, to record a value that can't exceed INT_MAX.
+
2013-10-16 Paul Eggert <address@hidden>
* process.h (conv_sockaddr_to_lisp): New decl, for newly-extern func.
=== modified file 'src/data.c'
--- a/src/data.c 2013-10-15 16:38:36 +0000
+++ b/src/data.c 2013-10-17 01:02:32 +0000
@@ -2980,7 +2980,7 @@
that we don't have to special-case empty bit vectors. */
static bits_word
-bool_vector_spare_mask (ptrdiff_t nr_bits)
+bool_vector_spare_mask (EMACS_INT nr_bits)
{
return (((bits_word) 1) << (nr_bits % BITS_PER_BITS_WORD)) - 1;
}
@@ -3218,7 +3218,7 @@
A must be a bool vector. B is a generalized bool. */)
(Lisp_Object a, Lisp_Object b)
{
- ptrdiff_t count;
+ EMACS_INT count;
EMACS_INT nr_bits;
bits_word *adata;
bits_word match;
@@ -3253,9 +3253,9 @@
index into the vector. */)
(Lisp_Object a, Lisp_Object b, Lisp_Object i)
{
- ptrdiff_t count;
+ EMACS_INT count;
EMACS_INT nr_bits;
- ptrdiff_t offset;
+ int offset;
bits_word *adata;
bits_word twiddle;
bits_word mword; /* Machine word. */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r114690: bool vector int width fixes,
Paul Eggert <=