Author: pjd Date: Thu Aug 5 18:56:24 2010 New Revision: 210879 URL: http://svn.freebsd.org/changeset/base/210879
Log: - Use pjdlog_exitx() to log errors and exit instead of errx(). - Use 'unable to' (instead of 'cannot') consistently. MFC after: 1 month Modified: head/sbin/hastd/hastd.c head/sbin/hastd/secondary.c Modified: head/sbin/hastd/hastd.c ============================================================================== --- head/sbin/hastd/hastd.c Thu Aug 5 18:49:06 2010 (r210878) +++ head/sbin/hastd/hastd.c Thu Aug 5 18:56:24 2010 (r210879) @@ -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); Modified: head/sbin/hastd/secondary.c ============================================================================== --- head/sbin/hastd/secondary.c Thu Aug 5 18:49:06 2010 (r210878) +++ head/sbin/hastd/secondary.c Thu Aug 5 18:56:24 2010 (r210879) @@ -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); } _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"