d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Use pjdlog_exitx() to log errors and exit instead of errx().

Browse Source 
- Use 'unable to' (instead of 'cannot') consistently.

MFC after:	1 month
This commit is contained in:
pjd 2010-08-05 18:56:24 +00:00
parent df8e8f6859
commit ed23731ef1
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sbin/hastd/hastd.c
View File

@ -490,7 +490,7 @@ main(int argc, char *argv[])
(intmax_t)otherpid);
}
/* If we cannot create pidfile from other reasons, only warn. */
pjdlog_errno(LOG_WARNING, "Cannot open or create pidfile");
pjdlog_errno(LOG_WARNING, "Unable to open or create pidfile");
}
cfg = yy_config_parse(cfgpath);

10
sbin/hastd/secondary.c
View File

@ -127,14 +127,16 @@ init_environment(void)
for (ii = 0; ii < HAST_HIO_MAX; ii++) {
hio = malloc(sizeof(*hio));
if (hio == NULL) {
errx(EX_TEMPFAIL, "cannot allocate %zu bytes of memory "
"for hio request", sizeof(*hio));
pjdlog_exitx(EX_TEMPFAIL,
"Unable to allocate memory (%zu bytes) for hio request.",
sizeof(*hio));
}
hio->hio_error = 0;
hio->hio_data = malloc(MAXPHYS);
if (hio->hio_data == NULL) {
errx(EX_TEMPFAIL, "cannot allocate %zu bytes of memory "
"for gctl_data", (size_t)MAXPHYS);
pjdlog_exitx(EX_TEMPFAIL,
"Unable to allocate memory (%zu bytes) for gctl_data.",
(size_t)MAXPHYS);
}
TAILQ_INSERT_HEAD(&hio_free_list, hio, hio_next);
}