summaryrefslogtreecommitdiffabout
path: root/src/wydawca.c
Side-by-side diff
Diffstat (limited to 'src/wydawca.c') (more/less context) (ignore whitespace changes)
-rw-r--r--src/wydawca.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/wydawca.c b/src/wydawca.c
index cc1815b..36aa8b7 100644
--- a/src/wydawca.c
+++ b/src/wydawca.c
@@ -62,25 +62,25 @@ void
syslog_printer (int prio, const char *fmt, va_list ap)
{
if (syslog_include_prio)
{
static char *fmtbuf;
static size_t fmtsize;
const char *p = mu_syslog_priority_to_string (prio);
size_t size = strlen (p) + 3 + strlen (fmt) + 1;
if (size > fmtsize)
{
fmtsize = size;
- fmtbuf = x2realloc (fmtbuf, &fmtsize);
+ fmtbuf = grecs_realloc (fmtbuf, fmtsize);
}
sprintf (fmtbuf, "[%s] %s", p, fmt);
fmt = fmtbuf;
}
#if HAVE_VSYSLOG
vsyslog (prio, fmt, ap);
#else
char buf[128];
vsnprintf (buf, sizeof buf, fmt, ap);
syslog (prio, "%s", buf);
#endif
@@ -170,35 +170,35 @@ stat_mask_p (unsigned long mask)
if (wydawca_stat[i] != 0 && (mask && STAT_MASK (i)))
return 1;
return 0;
}
static const char *
stat_expand (struct metadef *def, void *data)
{
size_t size = 0;
def->storage = NULL;
if (grecs_asprintf (&def->storage, &size, "%u",
wydawca_stat[(int) def->data]))
- xalloc_die ();
+ grecs_alloc_die ();
def->value = def->storage;
return def->value;
}
struct metadef *
make_stat_expansion (size_t count)
{
int i;
struct metadef *def, *p;
- def = xcalloc (MAX_STAT + count + 1, sizeof (def[0]));
+ def = grecs_calloc (MAX_STAT + count + 1, sizeof (def[0]));
p = def + count;
for (i = 0; i < MAX_STAT; i++, p++)
{
p->kw = stat_kwname[i];
p->value = NULL;
p->storage = NULL;
p->expand = stat_expand;
p->data = (void*) i;
}
p->kw = NULL;
return def;
}
@@ -243,25 +243,25 @@ grecs_print_diag (grecs_locus_t *locus, int err, int errcode, const char *msg)
}
static int uidc;
static uid_t *uidv;
static void
collect_uids (int argc, char **argv)
{
int i;
uidc = argc;
- uidv = xcalloc (uidc, sizeof (uidv[0]));
+ uidv = grecs_calloc (uidc, sizeof (uidv[0]));
for (i = 0; i < argc; i++)
{
struct passwd *pw = getpwnam (argv[i]);
if (!pw)
{
char *p;
unsigned n = strtoul (argv[i], &p, 10);
if (*p)
{
logmsg (LOG_ERR, _("no such user: %s"), argv[i]);
exit (EX_NOUSER);
}

Return to:

Send suggestions and report system problems to the System administrator.