Merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba

[Paul J. Lucas]

Fix the use of setlocale(3) in locale.cpp reported by Federico Cavalieri.

Fix the use of setlocale(3) in locale.cpp reported by Federico Cavalieri.

[Paul J. Lucas (paul-lucas)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-05-18T01-09-42.757Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job pjl-misc-2013-05-18T01-09-42.757Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1, Needs Information < 1, Resubmit < 1. Got: 1 Approve.

[Federico Cavalieri (fcavalieri)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-05-20T15-41-42.269Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job pjl-misc-2013-05-20T15-41-42.269Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/zorbautils/locale.cpp'
--- src/zorbautils/locale.cpp	2013-04-02 21:40:03 +0000
+++ src/zorbautils/locale.cpp	2013-05-18 00:55:30 +0000
@@ -233,7 +233,7 @@
   //
   // Try the environment locale first.
   //
-  char const *loc = filter_useless_locale( ::setlocale( LC_ALL, "" ) );
+  char const *loc = filter_useless_locale( ::setlocale( LC_ALL, nullptr ) );
   if ( !loc ) {
     //
     // Try the "LANG" environment variable second.