[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-537-g8f2a131

[Sandro Santilli]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  8f2a1314afcae214567e7c686746862127ed0a83 (commit)
      from  fb7d6ad3fb746a405c6c54813bf9c64f69f9e08f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=8f2a1314afcae214567e7c686746862127ed0a83


commit 8f2a1314afcae214567e7c686746862127ed0a83
Author: Sandro Santilli <address@hidden>
Date:   Thu Apr 7 23:48:43 2011 +0200

    cleanup/indenting

diff --git a/libbase/curl_adapter.cpp b/libbase/curl_adapter.cpp
index 0fe060e..679786c 100644
--- a/libbase/curl_adapter.cpp
+++ b/libbase/curl_adapter.cpp
@@ -254,12 +254,6 @@ CurlSession::~CurlSession()
     curl_global_cleanup();
 }
 
-#if BOOST_VERSION < 103500
-# define GNASH_DEFER_LOCK false
-#else
-# define GNASH_DEFER_LOCK boost::defer_lock
-#endif
-
 CurlSession::CurlSession()
     :
     _shandle(0),
@@ -326,34 +320,34 @@ CurlSession::lockSharedHandle(CURL* handle, 
curl_lock_data data,
     UNUSED(access);
 
     switch (data) {
-    case CURL_LOCK_DATA_DNS:
-       //log_debug("Locking DNS cache mutex");
-       lock(_dnscacheMutex);
-       //log_debug("DNS cache mutex locked");
-       break;
-    case CURL_LOCK_DATA_COOKIE:
-       //log_debug("Locking cookies mutex");
-       lock(_cookieMutex); 
-       //log_debug("Cookies mutex locked");
+        case CURL_LOCK_DATA_DNS:
+            //log_debug("Locking DNS cache mutex");
+            lock(_dnscacheMutex);
+            //log_debug("DNS cache mutex locked");
+            break;
+        case CURL_LOCK_DATA_COOKIE:
+            //log_debug("Locking cookies mutex");
+            lock(_cookieMutex); 
+            //log_debug("Cookies mutex locked");
+            break;
+        case CURL_LOCK_DATA_SHARE:
+            //log_debug("Locking share mutex");
+            lock(_shareMutex); 
+            //log_debug("Share mutex locked");
+            break;
+        case CURL_LOCK_DATA_SSL_SESSION:
+            log_error("lockSharedHandle: SSL session locking "
+              "unsupported");
+            break;
+        case CURL_LOCK_DATA_CONNECT:
+            log_error("lockSharedHandle: connect locking unsupported");
+            break;
+        case CURL_LOCK_DATA_LAST:
+            log_error("lockSharedHandle: last locking unsupported ?!");
+            break;
+        default:
+            log_error("lockSharedHandle: unknown shared data %d", data);
             break;
-    case CURL_LOCK_DATA_SHARE:
-       //log_debug("Locking share mutex");
-       lock(_shareMutex); 
-       //log_debug("Share mutex locked");
-       break;
-    case CURL_LOCK_DATA_SSL_SESSION:
-       log_error("lockSharedHandle: SSL session locking "
-                 "unsupported");
-       break;
-    case CURL_LOCK_DATA_CONNECT:
-       log_error("lockSharedHandle: connect locking unsupported");
-       break;
-    case CURL_LOCK_DATA_LAST:
-       log_error("lockSharedHandle: last locking unsupported ?!");
-       break;
-    default:
-       log_error("lockSharedHandle: unknown shared data %d", data);
-       break;
     }
 }
 

-----------------------------------------------------------------------

Summary of changes:
 libbase/curl_adapter.cpp |   60 ++++++++++++++++++++-------------------------
 1 files changed, 27 insertions(+), 33 deletions(-)


hooks/post-receive
-- 
Gnash