prepare v1.1.4

[awesomized/libmemcached] / src / libmemcached / error.cc

diff --git a/src/libmemcached/error.cc b/src/libmemcached/error.cc
index d148aafe1c930acd49bc5f769e7e2cb72fed6a0d..b5a2024d3158c8dce99e2339f92ef4661a83117d 100644 (file)
--- a/src/libmemcached/error.cc
+++ b/src/libmemcached/error.cc
@@ -1,6 +1,6 @@
 /*
     +--------------------------------------------------------------------+
-    | libmemcached - C/C++ Client Library for memcached                  |
+    | libmemcached-awesome - C/C++ Client Library for memcached          |
     +--------------------------------------------------------------------+
     | Redistribution and use in source and binary forms, with or without |
     | modification, are permitted under the terms of the BSD license.    |
@@ -9,7 +9,7 @@
     | the terms online at: https://opensource.org/licenses/BSD-3-Clause  |
     +--------------------------------------------------------------------+
     | Copyright (c) 2006-2014 Brian Aker   https://datadifferential.com/ |
-    | Copyright (c) 2020 Michael Wallner   <mike@php.net>                |
+    | Copyright (c) 2020-2021 Michael Wallner        https://awesome.co/ |
     +--------------------------------------------------------------------+
 */
 
@@ -129,7 +129,7 @@ static void _set(Memcached &memc, memcached_string_t *str, memcached_return_t &r
 #elif defined(HAVE_STRERROR_R) && HAVE_STRERROR_R
       strerror_r(local_errno, errmsg, sizeof(errmsg));
       errmsg_ptr = errmsg;
-#elif defined(HAVE_STRERROR) && HAVE_STRERROR
+#else
       snprintf(errmsg, sizeof(errmsg), "%s", strerror(local_errno));
       errmsg_ptr = errmsg;
 #endif
@@ -191,10 +191,6 @@ memcached_return_t memcached_set_error(memcached_instance_st &self, memcached_re
   return memcached_set_error(self, rc, at, tmp);
 }
 
-#ifndef __INTEL_COMPILER
-#  pragma GCC diagnostic ignored "-Wformat-nonliteral"
-#endif
-
 memcached_return_t memcached_set_error(Memcached &memc, memcached_return_t rc, const char *at,
                                        memcached_string_t &str) {
   assert_msg(rc != MEMCACHED_ERRNO,