~mordred/libmemcached/pandora-build

« back to all changes in this revision

Viewing changes to libmemcached/memcached.c

  • Committer: Brian Aker
  • Date: 2010-04-06 19:33:06 UTC
  • Revision ID: brian@gaz-20100406193306-323622xl553w37jf
Fix issue with memcached_st structure being a different size based on
compile.

Show diffs side-by-side

added added

removed removed

Lines of Context:
92
92
  self->get_key_failure= NULL;
93
93
  self->delete_trigger= NULL;
94
94
  self->callbacks= NULL;
95
 
#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT
96
 
  self->sasl.callbacks= NULL;
97
 
  self->sasl.is_allocated= false;
98
 
#endif
 
95
  self->sasl= NULL;
99
96
 
100
97
  return true;
101
98
}
170
167
  if (ptr->continuum)
171
168
    libmemcached_free(ptr, ptr->continuum);
172
169
 
 
170
  if (ptr->sasl)
 
171
  {
173
172
#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT
174
 
  if (ptr->sasl.callbacks != NULL)
175
 
  {
176
173
    memcached_destroy_sasl_auth_data(ptr);
 
174
#endif
177
175
  }
178
 
#endif
179
176
 
180
177
  if (memcached_is_allocated(ptr))
181
178
  {
267
264
  }
268
265
 
269
266
#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT
270
 
  if (source->sasl.callbacks)
 
267
  if (source->sasl && source->sasl->callbacks)
271
268
  {
272
269
    if (memcached_clone_sasl(new_clone, source) != MEMCACHED_SUCCESS)
273
270
    {