X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Foptions%2Fcontext.h;h=2597b196180ded836ef0a9b1c6dde53c387c3847;hb=a5f039742fa3d25829d788edff0e84bdc41401f7;hp=bbca66c855e23600646de64c627a585c8f8b5e39;hpb=30e386cd241ac56fd9205d12c143761475307705;p=m6w6%2Flibmemcached

diff --git a/libmemcached/options/context.h b/libmemcached/options/context.h
index bbca66c8..2597b196 100644
--- 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)
   {
-    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;
 
@@ -108,9 +108,9 @@ public:
       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_with_size(" ("));
+    memcached_string_append(error_string, memcached_literal_param(" ("));
 
     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_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);
   }