hash.size = 128;
hash.used = 0;
hash.next_index = 256;
- hash.tab = xmalloc (sizeof *hash.tab * hash.size);
+ hash.tab = xnmalloc (hash.size, sizeof *hash.tab);
hash.ar = pool_create ();
for (i = 0; i < hash.size; i++)
hash.tab[i].name = NULL;
int i, j;
hash.size *= 2;
- hash.tab = xmalloc (sizeof *hash.tab * hash.size);
+ hash.tab = xnmalloc (hash.size, sizeof *hash.tab);
for (i = 0; i < hash.size; i++)
hash.tab[i].name = NULL;
for (i = 0; i < old_size; i++)
font->deref_size = min_size + 16;
if (font->deref_size < 256)
font->deref_size = 256;
- font->deref = pool_realloc (font->owner, font->deref,
- sizeof *font->deref * font->deref_size);
+ font->deref = pool_nrealloc (font->owner, font->deref,
+ font->deref_size, sizeof *font->deref);
for (; i < font->deref_size; i++)
font->deref[i] = -1;
}
if (font->metric_used >= font->metric_size)
{
font->metric_size += 64;
- font->metric = pool_realloc (font->owner, font->metric,
- sizeof *font->metric * font->metric_size);
+ font->metric = pool_nrealloc (font->owner, font->metric,
+ font->metric_size, sizeof *font->metric);
}
font->metric[font->metric_used] = metrics;
font->deref[code] = font->metric_used++;
font->kern_size *= 2;
font->kern_max_used = font->kern_size / 2;
- font->kern = pool_malloc (font->owner,
- sizeof *font->kern * font->kern_size);
+ font->kern = pool_nmalloc (font->owner,
+ font->kern_size, sizeof *font->kern);
for (i = 0; i < font->kern_size; i++)
font->kern[i].ch1 = -1;
if (dev->n_sizes + 2 >= m_sizes)
{
m_sizes += 1;
- dev->sizes = xrealloc (dev->sizes,
- m_sizes * sizeof *dev->sizes);
+ dev->sizes = xnrealloc (dev->sizes,
+ m_sizes, sizeof *dev->sizes);
}
dev->sizes[dev->n_sizes++][0] = lower;
dev->sizes[dev->n_sizes][1] = upper;