summaryrefslogtreecommitdiff
path: root/usr/src/cmd/cron/cron.c
diff options
context:
space:
mode:
authorJerry Jelinek <jerry.jelinek@joyent.com>2019-07-09 11:44:10 +0000
committerJerry Jelinek <jerry.jelinek@joyent.com>2019-07-09 11:44:10 +0000
commita6fadc5b8524bc403c026a620fd325448da8f28f (patch)
treebc8617e28b65fa4ec413fc13be6200eb3225b035 /usr/src/cmd/cron/cron.c
parentb322ba367cdb75882f1cede5a8b22c7fd17ced94 (diff)
parent6f2b04a2ce785423fe988216ae694366499884b2 (diff)
downloadillumos-joyent-a6fadc5b8524bc403c026a620fd325448da8f28f.tar.gz
[illumos-gate merge]
commit 6f2b04a2ce785423fe988216ae694366499884b2 11304 cmd-crypto: NULL pointer errors commit 19803d096124c0f1ca62906eb328234556bfad35 11303 cron: NULL pointer errors commit a3ab7e857d66d206fcfc56f9a628266bd25a7bd0 11319 devfsadm: NULL pointer errors commit 1fbb7a7c3b62c369349ec1774806ed321e4f6119 11332 Regression: 11184 causes kernel hang during boot on CPUs without ARAT commit 62efa0e74455f83caa0fa7df8926a5ec9656b3ce 11213 tem: partially support CSI [ 38 and 48 sequences with smaller depths commit 023a3eeed3dc3724c83a2c43af879ce1719b2e32 11324 expr: NULL pointer errors commit c7cb3c8ba9fee2d8fc1a3ba06662ed84679fbd66 11323 syseventd: NULL pointer errors commit 1a80a7c52201c03ace9f85bdb77b768062b06136 11322 dfs.cmds: NULL pointer errors commit 8f32bfdc833ff8990921fa7b28a4d6bd970ef98f 11290 captoinfo: NULL pointer errors commit 84bdd7fe0904e8a6527441769054b6bc92a1ffe0 10329 Remove scsi_vhci_f_asym_sun (StorEdge T3 support) commit f9d4be10f65289547fa67ea8d1a3de54596b3ba1 11300 cpustat: NULL pointer errors
Diffstat (limited to 'usr/src/cmd/cron/cron.c')
-rw-r--r--usr/src/cmd/cron/cron.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/usr/src/cmd/cron/cron.c b/usr/src/cmd/cron/cron.c
index e2c9086536..247eb10c94 100644
--- a/usr/src/cmd/cron/cron.c
+++ b/usr/src/cmd/cron/cron.c
@@ -29,7 +29,7 @@
*/
/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
-/* All Rights Reserved */
+/* All Rights Reserved */
/* Copyright (c) 1987, 1988 Microsoft Corporation */
/* All Rights Reserved */
@@ -1245,7 +1245,7 @@ readcronfile(FILE *cf, struct usr *u, time_t reftime)
if (strncmp(&line[cursor], ENV_TZ,
strlen(ENV_TZ)) == 0) {
if ((tmp = strchr(&line[cursor], '\n')) != NULL) {
- *tmp = NULL;
+ *tmp = '\0';
}
if (!isvalid_tz(&line[cursor + strlen(ENV_TZ)], NULL,
@@ -1263,7 +1263,7 @@ readcronfile(FILE *cf, struct usr *u, time_t reftime)
if (strncmp(&line[cursor], ENV_HOME,
strlen(ENV_HOME)) == 0) {
if ((tmp = strchr(&line[cursor], '\n')) != NULL) {
- *tmp = NULL;
+ *tmp = '\0';
}
if (home == NULL ||
strcmp(&line[cursor], get_obj(home))) {
@@ -1277,7 +1277,7 @@ readcronfile(FILE *cf, struct usr *u, time_t reftime)
if (strncmp(&line[cursor], ENV_SHELL,
strlen(ENV_SHELL)) == 0) {
if ((tmp = strchr(&line[cursor], '\n')) != NULL) {
- *tmp = NULL;
+ *tmp = '\0';
}
if (shell == NULL ||
strcmp(&line[cursor], get_obj(shell))) {
@@ -2919,7 +2919,7 @@ msg_wait(long tim)
static void
process_msg(struct message *pmsg, time_t reftime)
{
- if (pmsg->etype == NULL)
+ if (pmsg->etype == 0)
return;
switch (pmsg->etype) {
@@ -3696,7 +3696,7 @@ contract_abandon_latest(pid_t pid)
static struct shared *
create_shared(void *obj, void * (*obj_alloc)(void *obj),
- void (*obj_free)(void *))
+ void (*obj_free)(void *))
{
struct shared *out;