Cleanup server.

diff --git a/libmemcached-1.0/struct/server.h b/libmemcached-1.0/struct/server.h
index d20b54a29a0bf95cf89fdbe52b05ebd74165e83b..fe984d1ce991bd92baf4a334569879b9641691ea 100644 (file)
--- a/libmemcached-1.0/struct/server.h
+++ b/libmemcached-1.0/struct/server.h
@@ -72,7 +72,6 @@ struct memcached_server_st {
   uint32_t number_of_hosts;
   uint32_t cursor_active;
   in_port_t port;
-  memcached_socket_t fd;
   uint32_t io_bytes_sent; /* # bytes sent since last read */
   uint32_t request_id;
   uint32_t server_failure_counter;
@@ -90,17 +89,9 @@ struct memcached_server_st {
   uint8_t micro_version; // ditto, and note that this is the third, not second version bit
   uint8_t minor_version; // ditto
   memcached_connection_t type;
-  char *read_ptr;
-  size_t read_buffer_length;
-  size_t read_data_length;
-  size_t write_buffer_offset;
-  struct addrinfo *address_info;
-  struct addrinfo *address_info_next;
   time_t next_retry;
   struct memcached_st *root;
   uint64_t limit_maxbytes;
   struct memcached_error_t *error_messages;
-  char read_buffer[MEMCACHED_MAX_BUFFER];
-  char write_buffer[MEMCACHED_MAX_BUFFER];
   char hostname[MEMCACHED_NI_MAXHOST];
 };

diff --git a/libmemcached/server.cc b/libmemcached/server.cc
index 8d9e9bbd175e87aeab2db814edf35a8f1c2e8c0c..a9d7c7284184ff3111a0c87b73d958486692b8f2 100644 (file)
--- a/libmemcached/server.cc
+++ b/libmemcached/server.cc
@@ -50,7 +50,6 @@ static inline void _server_init(memcached_server_st *self, memcached_st *root,
   self->number_of_hosts= 0;
   self->cursor_active= 0;
   self->port= port;
-  self->fd= INVALID_SOCKET;
   self->io_bytes_sent= 0;
   self->request_id= 0;
   self->server_failure_counter= 0;
@@ -65,12 +64,6 @@ static inline void _server_init(memcached_server_st *self, memcached_st *root,
   self->minor_version= UINT8_MAX;
   self->type= type;
   self->error_messages= NULL;
-  self->read_ptr= self->read_buffer;
-  self->read_buffer_length= 0;
-  self->read_data_length= 0;
-  self->write_buffer_offset= 0;
-  self->address_info= NULL;
-  self->address_info_next= NULL;
 
   self->state= MEMCACHED_SERVER_STATE_NEW;
   self->next_retry= 0;

diff --git a/rpm.am b/rpm.am
index a658132a302f47e9b8e717bded93526541c9e8de..9d7c5494f60acc1dda8158aab0970a9ddee23215 100644 (file)
--- a/rpm.am
+++ b/rpm.am
@@ -34,13 +34,5 @@ rpm: clean-rpm support/$(PACKAGE).spec man distcheck rpm-build
 
 release: rpm rpm-sign
 
-merge-clean:
-       @find ./ | $(GREP) \.moved | xargs rm -r -f
-       @find ./ | $(GREP) \.orig | xargs rm -f
-       @find ./ | $(GREP) \.rej | xargs rm -f
-       @find ./ | $(GREP) \~$$ | xargs rm -f
-       @echo "The follow files need to be removed or checked in:"
-       @bzr unknowns
-
 auto-rpmbuild:
        @auto-br-rpmbuild -ba support/libmemcached.spec