From eefe0f0d556fbf3d77602d0a99b9134505050756 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 16 Jul 2014 13:43:06 +0000 Subject: in _tcsncpy_s / _tcsncat_s / strncpy_s / strncat_s the second parameter to be omitted if the size of first one is fixed (not to contaminate sources with the excessive code) git-svn-id: http://svn.miranda-ng.org/main/trunk@9829 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Popup/src/bitmap_funcs.cpp | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) (limited to 'plugins/Popup') diff --git a/plugins/Popup/src/bitmap_funcs.cpp b/plugins/Popup/src/bitmap_funcs.cpp index 4385def2d1..4c9f42514c 100644 --- a/plugins/Popup/src/bitmap_funcs.cpp +++ b/plugins/Popup/src/bitmap_funcs.cpp @@ -912,26 +912,17 @@ bool MyBitmap::loadFromFile(const TCHAR *fn, const TCHAR *fnAlpha) if (bits) freemem(); if (!_tcsncmp(fn, _T("pixel:"), lstrlen(_T("pixel:")))) - { return loadFromFile_pixel(fn, fnAlpha); - } else + if (!_tcsncmp(fn, _T("gradient:"), lstrlen(_T("gradient:")))) - { return loadFromFile_gradient(fn, fnAlpha); - } else - { - TCHAR ext[5]; - _tcsncpy_s(ext, SIZEOF(ext), fn + (_tcslen(fn) - 4), _TRUNCATE); - if (!lstrcmpi(ext, _T(".png"))) - { - return loadFromFile_png(fn, fnAlpha); - } else - { - return loadFromFile_default(fn, fnAlpha); - } - } - // unreachable place - return false; + + TCHAR ext[5]; + _tcsncpy_s(ext, fn + (_tcslen(fn) - 4), _TRUNCATE); + if (!lstrcmpi(ext, _T(".png"))) + return loadFromFile_png(fn, fnAlpha); + + return loadFromFile_default(fn, fnAlpha); } void MyBitmap::allocate(int w, int h) -- cgit v1.2.3