[Gnash-commit] /srv/bzr/gnash/trunk r12159: all minor reformatting.

[Rob Savoye]

------------------------------------------------------------
revno: 12159
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Fri 2010-04-16 08:18:46 -0600
message:
  all minor reformatting.
modified:
  cygnal/libnet/network.cpp
  cygnal/libnet/rtmp.h
  libbase/log.h

=== modified file 'cygnal/libnet/network.cpp'
--- a/cygnal/libnet/network.cpp 2010-03-09 01:24:14 +0000
+++ b/cygnal/libnet/network.cpp 2010-04-16 14:18:46 +0000
@@ -420,13 +420,12 @@
     strncpy(addr.sun_path, sockname.c_str(), 100);
 
     _sockfd = ::socket(AF_UNIX, SOCK_STREAM, 0);
-    if (_sockfd < 0)
-        {
-            log_error(_("unable to create socket: %s"), strerror(errno));
-            _sockfd = -1;
-            return false;
-        }
-
+    if (_sockfd < 0) {
+       log_error(_("unable to create socket: %s"), strerror(errno));
+       _sockfd = -1;
+       return false;
+    }
+    
     retries = 2;
     while (retries-- > 0) {
         // We use select to wait for the read file descriptor to be
@@ -442,25 +441,23 @@
         ret = ::select(_sockfd+1, &fdset, NULL, NULL, &tval);
 
         // If interupted by a system call, try again
-        if (ret == -1 && errno == EINTR)
-            {
-                log_debug(_("The connect() socket for fd %d was interupted by 
a system call"),
-                        _sockfd);
-                continue;
-            }
+        if (ret == -1 && errno == EINTR) {
+           log_debug(_("The connect() socket for fd %d was interupted by a 
system call"),
+                     _sockfd);
+           continue;
+       }
 
-        if (ret == -1)
-            {
-                log_debug(_("The connect() socket for fd %d never was 
available for writing"),
-                        _sockfd);
+        if (ret == -1) {
+           log_debug(_("The connect() socket for fd %d never was available for 
writing"),
+                     _sockfd);
 #ifdef HAVE_WINSOCK_H
-                ::shutdown(_sockfd, 0); // FIXME: was SHUT_BOTH
+           ::shutdown(_sockfd, 0); // FIXME: was SHUT_BOTH
 #else
-                ::shutdown(_sockfd, SHUT_RDWR);
+           ::shutdown(_sockfd, SHUT_RDWR);
 #endif
-                _sockfd = -1;
-                return false;
-            }
+           _sockfd = -1;
+           return false;
+       }
         if (ret == 0) {
             log_error(_("The connect() socket for fd %d timed out waiting to 
write"),
                       _sockfd);

=== modified file 'cygnal/libnet/rtmp.h'
--- a/cygnal/libnet/rtmp.h      2010-03-11 01:47:08 +0000
+++ b/cygnal/libnet/rtmp.h      2010-04-16 14:18:46 +0000
@@ -45,10 +45,12 @@
 ///     The headers and data for the initial RTMP handshake differ from
 ///     what is used by RTMP during normal message processing. The layout
 ///     is this:
+/// <pre>
 ///     [version (1 byte)]
 ///     [1st timestamp (4 bytes)]
 ///     [2nd timestamp (4 bytes)]
 ///     [1528 bytes of random data]
+/// </pre>
 ///
 ///     The handshake process is client sends a handhsake request to the
 ///     server. This is 1537 bytes (version + handshake).

=== modified file 'libbase/log.h'
--- a/libbase/log.h     2010-01-25 18:52:20 +0000
+++ b/libbase/log.h     2010-04-16 14:18:46 +0000
@@ -465,5 +465,5 @@
 
 // Local Variables:
 // mode: C++
-// indent-tabs-mode: t
+// indent-tabs-mode: nil
 // End: