projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge Trunk
[m6w6/libmemcached]
/
libmemcached
/
options
/
context.h
diff --git
a/libmemcached/options/context.h
b/libmemcached/options/context.h
index bbca66c855e23600646de64c627a585c8f8b5e39..2597b196180ded836ef0a9b1c6dde53c387c3847 100644
(file)
--- a/
libmemcached/options/context.h
+++ b/
libmemcached/options/context.h
@@
-90,7
+90,7
@@
public:
const char *set_hostname(const char *str, size_t size)
{
const char *set_hostname(const char *str, size_t size)
{
- size_t copy_length=
std::min((size_t)NI_MAXHOST, size)
;
+ size_t copy_length=
(size_t)NI_MAXHOST > size ? size : (size_t)NI_MAXHOST
;
memcpy(_hostname, str, copy_length);
_hostname[copy_length]= 0;
memcpy(_hostname, str, copy_length);
_hostname[copy_length]= 0;
@@
-108,9
+108,9
@@
public:
rc= MEMCACHED_PARSE_ERROR;
memcached_string_st *error_string= memcached_string_create(memc, NULL, 1024);
rc= MEMCACHED_PARSE_ERROR;
memcached_string_st *error_string= memcached_string_create(memc, NULL, 1024);
- memcached_string_append(error_string, memcached_
string_with_size
("Error occured while parsing: "));
+ memcached_string_append(error_string, memcached_
literal_param
("Error occured while parsing: "));
memcached_string_append(error_string, memcached_string_make_from_cstr(begin));
memcached_string_append(error_string, memcached_string_make_from_cstr(begin));
- memcached_string_append(error_string, memcached_
string_with_size
(" ("));
+ memcached_string_append(error_string, memcached_
literal_param
(" ("));
if (rc == MEMCACHED_PARSE_ERROR and error)
{
if (rc == MEMCACHED_PARSE_ERROR and error)
{
@@
-120,9
+120,9
@@
public:
{
memcached_string_append(error_string, memcached_string_make_from_cstr(memcached_strerror(NULL, rc)));
}
{
memcached_string_append(error_string, memcached_string_make_from_cstr(memcached_strerror(NULL, rc)));
}
- memcached_string_append(error_string, memcached_
string_with_size
(")"));
+ memcached_string_append(error_string, memcached_
literal_param
(")"));
- memcached_set_error
_string(memc, rc
, memcached_string_value(error_string), memcached_string_length(error_string));
+ memcached_set_error
(*memc, rc, MEMCACHED_AT
, memcached_string_value(error_string), memcached_string_length(error_string));
memcached_string_free(error_string);
}
memcached_string_free(error_string);
}