Left: | ||
Right: |
OLD | NEW |
---|---|
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-2017 eyeo GmbH | 3 * Copyright (C) 2006-2017 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 |
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
12 * GNU General Public License for more details. | 12 * GNU General Public License for more details. |
13 * | 13 * |
14 * You should have received a copy of the GNU General Public License | 14 * You should have received a copy of the GNU General Public License |
15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. | 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. |
16 */ | 16 */ |
17 | 17 |
18 #include <cstdio> | 18 #include <cstdio> |
19 | 19 |
20 #include "ActiveFilter.h" | 20 #include "ActiveFilter.h" |
21 #include "../StringScanner.h" | 21 #include "../StringScanner.h" |
22 | 22 |
23 namespace | 23 namespace |
24 { | 24 { |
25 const DependentString DEFAULT_DOMAIN(u""_str); | 25 const DependentString DEFAULT_DOMAIN(u""_str); |
26 | 26 |
27 OwnedString to_string(unsigned int i) | 27 OwnedString to_string(unsigned int i) |
28 { | 28 { |
29 char buffer[11]; | 29 const std::size_t BUFFER_SIZE = 11; |
30 int len = sprintf(buffer, "%u", i); | 30 char buffer[BUFFER_SIZE]; |
31 int len = snprintf(buffer, BUFFER_SIZE, "%u", i); | |
31 | 32 |
32 OwnedString result(len); | 33 OwnedString result(len); |
hub
2017/04/06 10:31:23
From `man snprintf`
Wladimir Palant
2017/04/06 15:14:40
We have the same issue in the subscription classes
| |
33 for (String::size_type i = 0; i < len; i++) | 34 for (String::size_type i = 0; i < len; i++) |
34 result[i] = buffer[i]; | 35 result[i] = buffer[i]; |
35 return result; | 36 return result; |
36 } | 37 } |
37 } | 38 } |
38 | 39 |
39 ActiveFilter::ActiveFilter(Type type, const String& text, bool ignoreTrailingDot ) | 40 ActiveFilter::ActiveFilter(Type type, const String& text, bool ignoreTrailingDot ) |
40 : Filter(type, text), mDisabled(false), mHitCount(0), mLastHit(0), | 41 : Filter(type, text), mDisabled(false), mHitCount(0), mLastHit(0), |
41 mIgnoreTrailingDot(ignoreTrailingDot) | 42 mIgnoreTrailingDot(ignoreTrailingDot) |
42 { | 43 { |
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
198 result.append(u'\n'); | 199 result.append(u'\n'); |
199 } | 200 } |
200 if (mLastHit) | 201 if (mLastHit) |
201 { | 202 { |
202 result.append(u"lastHit="_str); | 203 result.append(u"lastHit="_str); |
203 result.append(to_string(mLastHit)); | 204 result.append(to_string(mLastHit)); |
204 result.append(u'\n'); | 205 result.append(u'\n'); |
205 } | 206 } |
206 return result; | 207 return result; |
207 } | 208 } |
OLD | NEW |