fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-18 15:18:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

test and util: maintain consistency in the usage of ARRAY_LENGTH macro

Browse source 
ARRAY_LENGTH macro is used in perf's cairo-perf.h, src's cairoint.h,
test's cairo-test.h and in some internal header files of util's
directory.So to maintain consistency ARRAY_SIZE is replaced with
ARRAY_LENGTH macro.

Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-by: Bryce Harrington <b.harrington@samsung.com>
This commit is contained in:
Ravi Nanjundappa 2014-04-23 08:32:19 +05:30 • committed by Bryce Harrington
parent 0e0004a971
commit 52b137bc3e
3 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
test/cairo-test.c
View file

@ -83,8 +83,8 @@
#define TRUE !FALSE
#endif
#ifndef ARRAY_SIZE
#define ARRAY_SIZE(A) (sizeof(A) / sizeof (A[0]))
#ifndef ARRAY_LENGTH
#define ARRAY_LENGTH(__array) ((int) (sizeof (__array) / sizeof (__array[0])))
#endif
#if ! HAVE_ALARM || ! defined(SIGALRM)
@ -1088,13 +1088,13 @@ REPEAT:
if (cairo_test_file_is_older (pass_filename,
filenames,
ARRAY_SIZE (filenames)))
ARRAY_LENGTH (filenames)))
{
_xunlink (ctx, pass_filename);
}
if (cairo_test_file_is_older (fail_filename,
filenames,
ARRAY_SIZE (filenames)))
ARRAY_LENGTH (filenames)))
{
_xunlink (ctx, fail_filename);
}
@ -1180,13 +1180,13 @@ REPEAT:
if (cairo_test_file_is_older (pass_filename,
filenames,
ARRAY_SIZE (filenames)))
ARRAY_LENGTH (filenames)))
{
_xunlink (ctx, pass_filename);
}
if (cairo_test_file_is_older (fail_filename,
filenames,
ARRAY_SIZE (filenames)))
ARRAY_LENGTH (filenames)))
{
_xunlink (ctx, fail_filename);
}

7
util/cairo-trace/trace.c
View file

@ -127,8 +127,9 @@ static void *_dlhandle = RTLD_NEXT;
(*name##_real) (args); \
})
#define ARRAY_SIZE(a) (sizeof (a) / sizeof (a[0]))
#define ARRAY_LENGTH(a) ((int) ARRAY_SIZE(a))
#ifndef ARRAY_LENGTH
#define ARRAY_LENGTH(__array) ((int) (sizeof (__array) / sizeof (__array[0])))
#endif
#if SIZEOF_VOID_P == 4
#define PTR_SHIFT 2
@ -280,7 +281,7 @@ _type_next_token (Type *t)
if (b->count < sizeof (b->map) * CHAR_BIT) {
unsigned int n, m, bit;
for (n = 0; n < ARRAY_SIZE (b->map); n++) {
for (n = 0; n < ARRAY_LENGTH (b->map); n++) {
if (b->map[n] == (unsigned int) -1)
continue;

9
util/malloc-stats.c
View file

@ -60,8 +60,9 @@ static struct alloc_stats_t total_allocations;
static struct func_stat_t *func_stats[31627];
static int func_stats_num;
#define ARRAY_SIZE(A) (sizeof (A)/sizeof (A[0]))
#ifndef ARRAY_LENGTH
#define ARRAY_LENGTH(__array) ((int) (sizeof (__array) / sizeof (__array[0])))
#endif
static void
alloc_stats_add (struct alloc_stats_t *stats, int is_realloc, size_t size)
{
@ -147,7 +148,7 @@ func_stats_add (const void *caller, int is_realloc, size_t size)
alloc_stats_add (&total_allocations, is_realloc, size);
i = ((uintptr_t) caller ^ 1215497) % ARRAY_SIZE (func_stats);
i = ((uintptr_t) caller ^ 1215497) % ARRAY_LENGTH (func_stats);
for (elt = func_stats[i]; elt != NULL; elt = elt->next) {
if (elt->addr == caller)
break;
@ -328,7 +329,7 @@ malloc_stats (void)
return;
j = 0;
for (i = 0; i < ARRAY_SIZE (func_stats); i++) {
for (i = 0; i < ARRAY_LENGTH (func_stats); i++) {
struct func_stat_t *elt;
for (elt = func_stats[i]; elt != NULL; elt = elt->next)
sorted_func_stats[j++] = *elt;