diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-06-29 13:28:56 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-06-29 13:28:56 +0000 |
| commit | e9686f2048541f02e63b97976f385b6efa0f4831 (patch) | |
| tree | a6f0ccfd3f6eba847c5e23e1b9d0f75a90d07a3c /usr/src/cmd/sgs | |
| parent | 9f27b084492b24583dbcc44e59ce9eaacd78ed68 (diff) | |
| parent | c7832f2df55c7f8d07e31fd48692e0cb47da34a2 (diff) | |
| download | illumos-joyent-e9686f2048541f02e63b97976f385b6efa0f4831.tar.gz | |
[illumos-gate merge]
commit c7832f2df55c7f8d07e31fd48692e0cb47da34a2
11218 loader: load vga text font
commit d646956405faf5fdc9460e6b19af1bcb7a5c11ae
11171 pam_modules: NULL pointer errors
commit da7753c428994e4e6c715886c93d7b49390c3705
11052 ZFS Reads may result in unneccesary calls to zil_commit
commit a1d63828c2e12098f43bb49de5b78a6bafc80979
11212 loader: console c_probe callback must be reusable
commit ffca9b6bef40a4b4cb6c2739812326c6234f7984
11090 libconv: NULL pointer errors
commit 097aa9ce8122e2a595b37e2c87d970fec0d5fcbb
11217 gfx_private vga font setup should use set_font() to search for vga font
commit a60ca23dc52059ace3f92bb9a63e723ac49e649b
11276 Allow unencrypted children of encrypted datasets
commit b70e94852cee03960a3aed9ab79cbd643b648628
11216 unix: always load font module
commit 45cf6faa16c9889e61cbdb6ee3758cdf856dd994
11215 loader: always pass font module to kernel
Conflicts:
usr/src/cmd/sgs/libconv/common/corenote.c
Diffstat (limited to 'usr/src/cmd/sgs')
| -rw-r--r-- | usr/src/cmd/sgs/libconv/common/corenote.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr/src/cmd/sgs/libconv/common/corenote.c b/usr/src/cmd/sgs/libconv/common/corenote.c index ce923bb039..f86d534450 100644 --- a/usr/src/cmd/sgs/libconv/common/corenote.c +++ b/usr/src/cmd/sgs/libconv/common/corenote.c @@ -2479,7 +2479,7 @@ conv_cnote_fileflags(uint32_t fileflags, Conv_fmt_flags_t fmt_flags, { 0x2000, MSG_PR_O_LARGEFILE }, { 0x20000, MSG_PR_O_NOFOLLOW }, { 0x40000, MSG_PR_O_NOLINKS }, - { 0, NULL }, + { 0, 0 }, }; arg.oflags = arg.rflags = fileflags; @@ -2531,7 +2531,7 @@ conv_cnote_filemode(uint32_t mode, Conv_fmt_flags_t fmt_flags, { 0004, MSG_S_IROTH }, { 0002, MSG_S_IWOTH }, { 0001, MSG_S_IXOTH }, - { 0, NULL }, + { 0, 0 }, }; arg.oflags = arg.rflags = mode & ~(0xf000); @@ -2570,7 +2570,7 @@ conv_cnote_filemode(uint32_t mode, Conv_fmt_flags_t fmt_flags, s = MSG_S_IFPORT; break; default: - s = NULL; + s = 0; break; } |