Changeset 1143

Timestamp:

03/12/10 05:29:11 (2 years ago)

Author:

rakshasa

Message:

* Fixed the linux fallocate detection script.

Location:

trunk

Files:

• libtorrent/scripts/checks.m4 (modified) (1 diff)
• libtorrent/src/protocol/extensions.cc (modified) (1 diff)
• libtorrent/src/protocol/peer_connection_leech.cc (modified) (1 diff)
• libtorrent/src/torrent/object_stream.cc (modified) (1 diff)
• rtorrent/scripts/checks.m4 (modified) (1 diff)

trunk/libtorrent/scripts/checks.m4

@@ -163 +163 @@
   AC_COMPILE_IFELSE(
     [[#include <fcntl.h>
-      int main() {
-        fallocate(0, FALLOC_FL_KEEP_SIZE, 0, 0);
+      #include <linux/falloc.h>
+      int main() {
+      fallocate(0, FALLOC_FL_KEEP_SIZE, 0, 0);
         return 0;
       }

trunk/libtorrent/src/protocol/extensions.cc

@@ -245 +245 @@
     // Ignore malformed messages.
     // DEBUG:
-    throw internal_error("ProtocolExtension::read_done '" + std::string(m_read, std::distance(m_read, m_readPos)) + "'");
+//     throw internal_error("ProtocolExtension::read_done '" + std::string(m_read, std::distance(m_read, m_readPos)) + "'");
   }
 

trunk/libtorrent/src/protocol/peer_connection_leech.cc

@@ -465 +465 @@
     std::stringstream s;
     s << "Connection read fd(" << get_fd().get_fd() << ',' << m_down->get_state() << ',' << m_down->last_command() << ") \"" << e.what() << '"';
-    //    s << " '" << rak::copy_escape_html((char*)m_down->buffer()->begin(), (char*)m_down->buffer()->position()) << "'";
+    s << " '" << rak::copy_escape_html((char*)m_down->buffer()->begin(), (char*)m_down->buffer()->position()) << "'";
 
     throw internal_error(s.str());

trunk/libtorrent/src/torrent/object_stream.cc

@@ -873 +873 @@
 
   // DEBUG: Remove this.
-  {
-    torrent::Object obj;
-    if (object_read_bencode_c(output.buffer.first, output.pos, &obj) != output.pos) {
-      std::string escaped = rak::copy_escape_html(output.buffer.first, output.pos);
-
-      //char buffer[1024];
-      //      sprintf(buffer, "Verified wrong, %u, '%u', '%s'.", std::distanescaped.c_str());
-
-      throw torrent::internal_error("Invalid bencode data generated: '" + escaped + "'");
-    }
-  }
+//   {
+//     torrent::Object obj;
+//     if (object_read_bencode_c(output.buffer.first, output.pos, &obj) != output.pos) {
+//       std::string escaped = rak::copy_escape_html(output.buffer.first, output.pos);
+
+//       //char buffer[1024];
+//       //      sprintf(buffer, "Verified wrong, %u, '%u', '%s'.", std::distanescaped.c_str());
+
+//       throw torrent::internal_error("Invalid bencode data generated: '" + escaped + "'");
+//     }
+//   }
 
   // Don't flush the buffer.

trunk/rtorrent/scripts/checks.m4

@@ -163 +163 @@
   AC_COMPILE_IFELSE(
     [[#include <fcntl.h>
-      int main() {
-        fallocate(0, FALLOC_FL_KEEP_SIZE, 0, 0);
+      #include <linux/falloc.h>
+      int main() {
+      fallocate(0, FALLOC_FL_KEEP_SIZE, 0, 0);
         return 0;
       }