Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: src/plugin/PluginUtil.cpp

Issue 29332775: Issue #1234 - Remove 'CString' From 'ToLowerString()' (Closed)
Patch Set: address comments, round two Created Jan. 7, 2016, 2:32 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « src/plugin/PluginUtil.h ('k') | test/plugin/UtilTest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * This file is part of Adblock Plus <https://adblockplus.org/>, 2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-2015 Eyeo GmbH 3 * Copyright (C) 2006-2015 Eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 ATL::CComBSTR locationUrl; 48 ATL::CComBSTR locationUrl;
49 if (FAILED(browser.get_LocationURL(&locationUrl)) || !locationUrl) 49 if (FAILED(browser.get_LocationURL(&locationUrl)) || !locationUrl)
50 { 50 {
51 return std::wstring(); 51 return std::wstring();
52 } 52 }
53 return std::wstring(locationUrl, locationUrl.Length()); 53 return std::wstring(locationUrl, locationUrl.Length());
54 } 54 }
55 55
56 std::wstring ToLowerString(const std::wstring& s) 56 std::wstring ToLowerString(const std::wstring& s)
57 { 57 {
58 return ToWstring(ToCString(s).MakeLower()); 58 std::wstring lower(s); // Copy the argument
59 /*
60 * Documentation for '_wcslwr_s' https://msdn.microsoft.com/en-us/library/y889 wzfw.aspx
61 * This documentation is incorrect on an important point.
62 * Regarding parameter validation, it says "length of string" where it should say "length of buffer".
63 * The call below has argument "length + 1" to include the terminating null ch aracter in the buffer.
64 */
65 auto e = _wcslwr_s(const_cast<wchar_t*>(lower.c_str()), lower.length() + 1); / / uses the current locale
66 if (e != 0)
67 {
68 throw std::logic_error("Error code returned from _wcslwr_s()");
69 }
70 return lower;
59 } 71 }
60 72
OLDNEW
« no previous file with comments | « src/plugin/PluginUtil.h ('k') | test/plugin/UtilTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld