projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
See if this fixes issue with 64bit Ubuntu
[awesomized/libmemcached]
/
libmemcached
/
string.c
diff --git
a/libmemcached/string.c
b/libmemcached/string.c
index b69433900463ab59b5d32d1f1bdb7db92064f329..b5badc5eff8bb23f970fdd9d5f262cd9ecb60324 100644
(file)
--- a/
libmemcached/string.c
+++ b/
libmemcached/string.c
@@
-32,7
+32,9
@@
inline static memcached_return_t _string_check(memcached_string_st *string, size
new_value= libmemcached_realloc(string->root, string->string, new_size);
if (new_value == NULL)
new_value= libmemcached_realloc(string->root, string->string, new_size);
if (new_value == NULL)
+ {
return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
+ }
string->string= new_value;
string->end= string->string + current_offset;
string->string= new_value;
string->end= string->string + current_offset;
@@
-73,14
+75,19
@@
memcached_string_st *memcached_string_create(const memcached_st *memc, memcached
self->options.is_allocated= true;
}
self->options.is_allocated= true;
}
- self->root= memc;
+ self->root=
(memcached_st *)
memc;
_init_string(self);
rc= _string_check(self, initial_size);
if (rc != MEMCACHED_SUCCESS)
{
_init_string(self);
rc= _string_check(self, initial_size);
if (rc != MEMCACHED_SUCCESS)
{
+ if (rc == MEMCACHED_MEMORY_ALLOCATION_FAILURE)
+ {
+ memcached_set_errno(self->root, errno, NULL);
+ }
libmemcached_free(memc, self);
libmemcached_free(memc, self);
+
return NULL;
}
return NULL;
}
@@
-99,7
+106,9
@@
memcached_return_t memcached_string_append_character(memcached_string_st *string
rc= _string_check(string, 1);
if (rc != MEMCACHED_SUCCESS)
rc= _string_check(string, 1);
if (rc != MEMCACHED_SUCCESS)
+ {
return rc;
return rc;
+ }
*string->end= character;
string->end++;
*string->end= character;
string->end++;
@@
-115,7
+124,9
@@
memcached_return_t memcached_string_append(memcached_string_st *string,
rc= _string_check(string, length);
if (rc != MEMCACHED_SUCCESS)
rc= _string_check(string, length);
if (rc != MEMCACHED_SUCCESS)
+ {
return rc;
return rc;
+ }
WATCHPOINT_ASSERT(length <= string->current_size);
WATCHPOINT_ASSERT(string->string);
WATCHPOINT_ASSERT(length <= string->current_size);
WATCHPOINT_ASSERT(string->string);
@@
-177,27
+188,27
@@
memcached_return_t memcached_string_check(memcached_string_st *string, size_t ne
return _string_check(string, need);
}
return _string_check(string, need);
}
-
inline
size_t memcached_string_length(const memcached_string_st *self)
+size_t memcached_string_length(const memcached_string_st *self)
{
return (size_t)(self->end - self->string);
}
{
return (size_t)(self->end - self->string);
}
-
inline
size_t memcached_string_size(const memcached_string_st *self)
+size_t memcached_string_size(const memcached_string_st *self)
{
return self->current_size;
}
{
return self->current_size;
}
-
inline
const char *memcached_string_value(const memcached_string_st *self)
+const char *memcached_string_value(const memcached_string_st *self)
{
return self->string;
}
{
return self->string;
}
-
inline
char *memcached_string_value_mutable(const memcached_string_st *self)
+char *memcached_string_value_mutable(const memcached_string_st *self)
{
return self->string;
}
{
return self->string;
}
-
inline
void memcached_string_set_length(memcached_string_st *self, size_t length)
+void memcached_string_set_length(memcached_string_st *self, size_t length)
{
self->end= self->string + length;
}
{
self->end= self->string + length;
}