NO-OP re-indent

[ardour.git] / libs / pbd / locale_guard.cc

diff --git a/libs/pbd/locale_guard.cc b/libs/pbd/locale_guard.cc
index 30fdeadebae5ee8a9ee44f9f90a55dcec3d78b52..4ec64984b08abe05f8bef216389467485ddb663c 100644 (file)
--- a/libs/pbd/locale_guard.cc
+++ b/libs/pbd/locale_guard.cc
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2012 Paul Davis
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #include <stdlib.h>
 #include <string.h>
 #include <locale.h>
@@ -6,24 +25,30 @@
 
 using namespace PBD;
 
+// try to avoid calling setlocale() recursively.  this is not thread-safe.
+std::string PBD::LocaleGuard::current;
+
 LocaleGuard::LocaleGuard (const char* str)
+       : old(0)
 {
-       old = setlocale (LC_NUMERIC, NULL);
-
-        if (old) {
-                old = strdup (old);
-                if (strcmp (old, str)) {
-                        setlocale (LC_NUMERIC, str);
-                }
-        }
+       if (current != str) {
+               old = strdup (setlocale (LC_NUMERIC, NULL));
+               if (strcmp (old, str)) {
+                       if (setlocale (LC_NUMERIC, str)) {
+                               current = str;
+                       }
+               }
+       }
 }
 
 LocaleGuard::~LocaleGuard ()
 {
-       setlocale (LC_NUMERIC, old);
+       if (old) {
+               if (setlocale (LC_NUMERIC, old)) {
+                       current = old;
+               }
 
-        if (old) {
-                free ((char*)old);
-        }
+               free (old);
+       }
 }