aboutsummaryrefslogtreecommitdiffstats
path: root/src/alloc.c
diff options
context:
space:
mode:
authorDaniel Colascione2014-04-03 13:46:04 -0700
committerDaniel Colascione2014-04-03 13:46:04 -0700
commitc72d972c5dee96489a3fd881b239f3f7d0db2385 (patch)
treee2004a9d5ed96a27bf9f88a9bfe2b2c097245e29 /src/alloc.c
parent705cf384bec23354ad22a5c48d3430a96ef70ca1 (diff)
downloademacs-c72d972c5dee96489a3fd881b239f3f7d0db2385.tar.gz
emacs-c72d972c5dee96489a3fd881b239f3f7d0db2385.zip
Rename EARRAYSIZE to ARRAYELTS
Diffstat (limited to 'src/alloc.c')
-rw-r--r--src/alloc.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/alloc.c b/src/alloc.c
index 46b4f5021df..9740afe2ab8 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -6835,7 +6835,7 @@ find_suspicious_object_in_range (void* begin, void* end)
6835 char* end_a = end; 6835 char* end_a = end;
6836 int i; 6836 int i;
6837 6837
6838 for (i = 0; i < EARRAYSIZE (suspicious_objects); ++i) { 6838 for (i = 0; i < ARRAYELTS (suspicious_objects); ++i) {
6839 char* suspicious_object = suspicious_objects[i]; 6839 char* suspicious_object = suspicious_objects[i];
6840 if (begin_a <= suspicious_object && suspicious_object < end_a) 6840 if (begin_a <= suspicious_object && suspicious_object < end_a)
6841 return suspicious_object; 6841 return suspicious_object;
@@ -6852,12 +6852,12 @@ detect_suspicious_free (void* ptr)
6852 6852
6853 eassert (ptr != NULL); 6853 eassert (ptr != NULL);
6854 6854
6855 for (i = 0; i < EARRAYSIZE (suspicious_objects); ++i) 6855 for (i = 0; i < ARRAYELTS (suspicious_objects); ++i)
6856 if (suspicious_objects[i] == ptr) 6856 if (suspicious_objects[i] == ptr)
6857 { 6857 {
6858 rec = &suspicious_free_history[suspicious_free_history_index++]; 6858 rec = &suspicious_free_history[suspicious_free_history_index++];
6859 if (suspicious_free_history_index == 6859 if (suspicious_free_history_index ==
6860 EARRAYSIZE (suspicious_free_history)) 6860 ARRAYELTS (suspicious_free_history))
6861 { 6861 {
6862 suspicious_free_history_index = 0; 6862 suspicious_free_history_index = 0;
6863 } 6863 }
@@ -6865,7 +6865,7 @@ detect_suspicious_free (void* ptr)
6865 memset (rec, 0, sizeof (*rec)); 6865 memset (rec, 0, sizeof (*rec));
6866 rec->suspicious_object = ptr; 6866 rec->suspicious_object = ptr;
6867#ifdef HAVE_EXECINFO_H 6867#ifdef HAVE_EXECINFO_H
6868 backtrace (&rec->backtrace[0], EARRAYSIZE (rec->backtrace)); 6868 backtrace (&rec->backtrace[0], ARRAYELTS (rec->backtrace));
6869#endif 6869#endif
6870 suspicious_objects[i] = NULL; 6870 suspicious_objects[i] = NULL;
6871 } 6871 }
@@ -6884,7 +6884,7 @@ garbage collection bugs. Otherwise, do nothing and return OBJ. */)
6884 /* Right now, we care only about vectors. */ 6884 /* Right now, we care only about vectors. */
6885 if (VECTORLIKEP (obj)) { 6885 if (VECTORLIKEP (obj)) {
6886 suspicious_objects[suspicious_object_index++] = XVECTOR (obj); 6886 suspicious_objects[suspicious_object_index++] = XVECTOR (obj);
6887 if (suspicious_object_index == EARRAYSIZE (suspicious_objects)) 6887 if (suspicious_object_index == ARRAYELTS (suspicious_objects))
6888 suspicious_object_index = 0; 6888 suspicious_object_index = 0;
6889 } 6889 }
6890#endif 6890#endif