crc32c: prefix with ceph_

diff --git a/src/common/sctp_crc32.c b/src/common/sctp_crc32.c
index da27e918ece51b333c0ab26a712863af7daaa96b..c6f314155917b9adf46f43a33d5fb8ab08b482d3 100644 (file)
--- a/src/common/sctp_crc32.c
+++ b/src/common/sctp_crc32.c
@@ -592,7 +592,7 @@ sctp_crc32c_sb8_64_bit(uint32_t crc,
  *
  *             none
  */
-uint32_t
+static uint32_t
 update_crc32(uint32_t crc32c,
     unsigned char const *buffer,
     unsigned int length)
@@ -676,7 +676,7 @@ uint32_t sctp_crc_c[256] = {
 
 #define SCTP_CRC32C(c,d) (c=(c>>8)^sctp_crc_c[(c^(d))&0xFF])
 
-uint32_t
+static uint32_t
 old_update_crc32(uint32_t crc32c,
     unsigned char const *buffer,
     unsigned int length)
@@ -690,7 +690,7 @@ old_update_crc32(uint32_t crc32c,
 }
 
 
-uint32_t
+static uint32_t
 sctp_csum_finalize(uint32_t crc32c)
 {
        uint32_t result;
@@ -723,7 +723,7 @@ sctp_csum_finalize(uint32_t crc32c)
        return (crc32c);
 }
 
-uint32_t crc32c_le(uint32_t crc, unsigned char const *data, unsigned length)
+uint32_t ceph_crc32c_le(uint32_t crc, unsigned char const *data, unsigned length)
 {
        return update_crc32(crc, data, length);
 }

diff --git a/src/include/buffer.h b/src/include/buffer.h
index b311c4fd67e12bb6f7a5cfb8e6843bf20c5b3577..83faa6c131ee40d7642fd38f80d226c5d87b46f6 100644 (file)
--- a/src/include/buffer.h
+++ b/src/include/buffer.h
@@ -1137,7 +1137,7 @@ public:
           it != _buffers.end(); 
           it++)
        if (it->length())
-         crc = crc32c_le(crc, (unsigned char*)it->c_str(), it->length());
+         crc = ceph_crc32c_le(crc, (unsigned char*)it->c_str(), it->length());
       return crc;
     }
 

diff --git a/src/include/crc32c.h b/src/include/crc32c.h
index c0efcb9e2ccc7d10c35f794872bc31c662c8474f..185ab7f23efcccf8878a5beb216e7b34c88e8aa2 100644 (file)
--- a/src/include/crc32c.h
+++ b/src/include/crc32c.h
@@ -5,7 +5,7 @@
 extern "C" {
 #endif
 
-uint32_t crc32c_le(uint32_t crc, unsigned char const *data, unsigned length);
+uint32_t ceph_crc32c_le(uint32_t crc, unsigned char const *data, unsigned length);
 
 #ifdef __cplusplus
 }

diff --git a/src/msg/Message.h b/src/msg/Message.h
index 2d1f329f0fdcc5372a2468f8e40b4f27b7ac30e5..99b3d32afcb89e90c6bca18c3928ed11f788332f 100644 (file)
--- a/src/msg/Message.h
+++ b/src/msg/Message.h
@@ -291,7 +291,7 @@ public:
   utime_t get_recv_stamp() { return recv_stamp; }
 
   void calc_header_crc() {
-    header.crc = crc32c_le(0, (unsigned char*)&header,
+    header.crc = ceph_crc32c_le(0, (unsigned char*)&header,
                           sizeof(header) - sizeof(header.crc));
   }
   void calc_front_crc() {

diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc
index 370b3c5ecb57bd8ab91296a48ec0a3fd35d1cec4..2a33a315ff8d704d7202c6ac26e2660b55d20c64 100644 (file)
--- a/src/msg/SimpleMessenger.cc
+++ b/src/msg/SimpleMessenger.cc
@@ -1689,7 +1689,7 @@ Message *SimpleMessenger::Pipe::read_message()
   if (connection_state->has_feature(CEPH_FEATURE_NOSRCADDR)) {
     if (tcp_read( sd, (char*)&header, sizeof(header) ) < 0)
       return 0;
-    header_crc = crc32c_le(0, (unsigned char *)&header, sizeof(header) - sizeof(header.crc));
+    header_crc = ceph_crc32c_le(0, (unsigned char *)&header, sizeof(header) - sizeof(header.crc));
   } else {
     ceph_msg_header_old oldheader;
     if (tcp_read( sd, (char*)&oldheader, sizeof(oldheader) ) < 0)
@@ -1699,7 +1699,7 @@ Message *SimpleMessenger::Pipe::read_message()
     header.src = oldheader.src.name;
     header.reserved = oldheader.reserved;
     header.crc = oldheader.crc;
-    header_crc = crc32c_le(0, (unsigned char *)&oldheader, sizeof(oldheader) - sizeof(oldheader.crc));
+    header_crc = ceph_crc32c_le(0, (unsigned char *)&oldheader, sizeof(oldheader) - sizeof(oldheader.crc));
   }
 
   dout(20) << "reader got envelope type=" << header.type
@@ -1970,7 +1970,7 @@ int SimpleMessenger::Pipe::write_message(Message *m)
     oldheader.src.addr = connection_state->get_peer_addr();
     oldheader.orig_src = oldheader.src;
     oldheader.reserved = header.reserved;
-    oldheader.crc = crc32c_le(0, (unsigned char*)&oldheader,
+    oldheader.crc = ceph_crc32c_le(0, (unsigned char*)&oldheader,
                              sizeof(oldheader) - sizeof(oldheader.crc));
     msgvec[msg.msg_iovlen].iov_base = (char*)&oldheader;
     msgvec[msg.msg_iovlen].iov_len = sizeof(oldheader);