A RetroSearch Logo

Home - News ( United States | United Kingdom | Italy | Germany ) - Football scores

Search Query:

Showing content from https://github.com/log4cplus/log4cplus/commit/fe3d648e1bc553b51b752707000ff74fb9bf4969 below:

Merge pull request #450 from solicomo/=-in-sub-ini-file-path · log4cplus/log4cplus@fe3d648 · GitHub

File tree Expand file treeCollapse file tree 1 file changed

+14

-11

lines changed

Filter options

Expand file treeCollapse file tree 1 file changed

+14

-11

lines changed Original file line number Diff line number Diff line change

@@ -247,17 +247,8 @@ Properties::init(tistream& input)

247 247

// Remove trailing 'Windows' \r.

248 248

buffer.resize (buffLen - 1);

249 249 250 -

tstring::size_type const idx = buffer.find(LOG4CPLUS_TEXT ('='));

251 -

if (idx != tstring::npos)

252 -

{

253 -

tstring key = buffer.substr(0, idx);

254 -

tstring value = buffer.substr(idx + 1);

255 -

trim_trailing_ws (key);

256 -

trim_ws (value);

257 -

setProperty(key, value);

258 -

}

259 -

else if (buffer.compare (0, 7, LOG4CPLUS_TEXT ("include")) == 0

260 -

&& buffer.size () >= 7 + 1 + 1

250 +

if (buffer.size () >= 7 + 1 + 1

251 +

&& buffer.compare (0, 7, LOG4CPLUS_TEXT ("include")) == 0

261 252

&& is_space (buffer[7]))

262 253

{

263 254

tstring included (buffer, 8) ;

@@ -274,6 +265,18 @@ Properties::init(tistream& input)

274 265 275 266

init (file);

276 267

}

268 +

else

269 +

{

270 +

tstring::size_type const idx = buffer.find(LOG4CPLUS_TEXT ('='));

271 +

if (idx != tstring::npos)

272 +

{

273 +

tstring key = buffer.substr(0, idx);

274 +

tstring value = buffer.substr(idx + 1);

275 +

trim_trailing_ws (key);

276 +

trim_ws (value);

277 +

setProperty(key, value);

278 +

}

279 +

}

277 280

}

278 281

}

279 282

You can’t perform that action at this time.


RetroSearch is an open source project built by @garambo | Open a GitHub Issue

Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo

HTML: 3.2 | Encoding: UTF-8 | Version: 0.7.4