Use NULL instead of 0 for pointers.
dbopen(3) will returns a NULL on error. MFC after: 2 weeks.
This commit is contained in:
parent
0b410d9c57
commit
14adaa14cb
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=298236
@ -1144,7 +1144,7 @@ start_session_db(void)
|
|||||||
{
|
{
|
||||||
if (session_db && (*session_db->close)(session_db))
|
if (session_db && (*session_db->close)(session_db))
|
||||||
emergency("session database close: %s", strerror(errno));
|
emergency("session database close: %s", strerror(errno));
|
||||||
if ((session_db = dbopen(NULL, O_RDWR, 0, DB_HASH, NULL)) == 0) {
|
if ((session_db = dbopen(NULL, O_RDWR, 0, DB_HASH, NULL)) == NULL) {
|
||||||
emergency("session database open: %s", strerror(errno));
|
emergency("session database open: %s", strerror(errno));
|
||||||
return (1);
|
return (1);
|
||||||
}
|
}
|
||||||
@ -1284,7 +1284,7 @@ new_session(session_t *sprev, struct ttyent *typ)
|
|||||||
}
|
}
|
||||||
|
|
||||||
sp->se_next = 0;
|
sp->se_next = 0;
|
||||||
if (sprev == 0) {
|
if (sprev == NULL) {
|
||||||
sessions = sp;
|
sessions = sp;
|
||||||
sp->se_prev = 0;
|
sp->se_prev = 0;
|
||||||
} else {
|
} else {
|
||||||
@ -1311,7 +1311,7 @@ setupargv(session_t *sp, struct ttyent *typ)
|
|||||||
sprintf(sp->se_getty, "%s %s", typ->ty_getty, typ->ty_name);
|
sprintf(sp->se_getty, "%s %s", typ->ty_getty, typ->ty_name);
|
||||||
sp->se_getty_argv_space = strdup(sp->se_getty);
|
sp->se_getty_argv_space = strdup(sp->se_getty);
|
||||||
sp->se_getty_argv = construct_argv(sp->se_getty_argv_space);
|
sp->se_getty_argv = construct_argv(sp->se_getty_argv_space);
|
||||||
if (sp->se_getty_argv == 0) {
|
if (sp->se_getty_argv == NULL) {
|
||||||
warning("can't parse getty for port %s", sp->se_device);
|
warning("can't parse getty for port %s", sp->se_device);
|
||||||
free(sp->se_getty);
|
free(sp->se_getty);
|
||||||
free(sp->se_getty_argv_space);
|
free(sp->se_getty_argv_space);
|
||||||
@ -1329,7 +1329,7 @@ setupargv(session_t *sp, struct ttyent *typ)
|
|||||||
sp->se_window = strdup(typ->ty_window);
|
sp->se_window = strdup(typ->ty_window);
|
||||||
sp->se_window_argv_space = strdup(sp->se_window);
|
sp->se_window_argv_space = strdup(sp->se_window);
|
||||||
sp->se_window_argv = construct_argv(sp->se_window_argv_space);
|
sp->se_window_argv = construct_argv(sp->se_window_argv_space);
|
||||||
if (sp->se_window_argv == 0) {
|
if (sp->se_window_argv == NULL) {
|
||||||
warning("can't parse window for port %s",
|
warning("can't parse window for port %s",
|
||||||
sp->se_device);
|
sp->se_device);
|
||||||
free(sp->se_window_argv_space);
|
free(sp->se_window_argv_space);
|
||||||
|
Loading…
Reference in New Issue
Block a user