Skip to content

Commit 54e4da9

Browse files
committed
views: remove null check
- With newer compiler/libraries, getting error ``` VwTxtSrc.cpp(1864,38): error GB35ED869: the address of ‘__MIDL___MIDL_itf_FwKernelTlb_0001_0086_0001::szFaceName’ will never be NULL [-Werror=address] 1864 | if (pchrpOverride.szFaceName != NULL && wcslen(pchrpOverride.szFaceName) != 0) | ^ In file included from Main.h:95, from VwTxtSrc.cpp:18: FwKernelTlb.h:740:13: note: ‘__MIDL___MIDL_itf_FwKernelTlb_0001_0086_0001::szFaceName’ declared here 740 | OLECHAR szFaceName[ 32 ]; | ^~~~~~~~~~ ``` and the same for `szFontVar`. Change-Id: I6488eb44eef76eeddcd4f6cbd0e6c40c94fb4a70
1 parent a95f116 commit 54e4da9

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Src/views/VwTxtSrc.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1861,9 +1861,9 @@ void VwOverrideTxtSrc::Merge(LgCharRenderProps * pchrpOrig, LgCharRenderProps &
18611861
pchrpOrig->ttvItalic = pchrpOverride.ttvItalic;
18621862
if (pchrpOverride.dympHeight > -1)
18631863
pchrpOrig->dympHeight = pchrpOverride.dympHeight;
1864-
if (pchrpOverride.szFaceName != NULL && wcslen(pchrpOverride.szFaceName) != 0)
1864+
if (wcslen(pchrpOverride.szFaceName) != 0)
18651865
wcscpy_s(pchrpOrig->szFaceName, LF_FACESIZE, pchrpOverride.szFaceName);
1866-
if (pchrpOverride.szFontVar != NULL && wcslen(pchrpOverride.szFontVar) != 0)
1866+
if (wcslen(pchrpOverride.szFontVar) != 0)
18671867
wcscpy_s(pchrpOrig->szFontVar, 64, pchrpOverride.szFontVar);
18681868
}
18691869

0 commit comments

Comments
 (0)