X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbin%2Fcommon%2Foptions.hpp;h=93275b338f949fd753fd34cfec46a6fcd76122f6;hb=HEAD;hp=980ca38dc39ab8865a498002e98d6f334d4c2814;hpb=4b584c02c679edd005cd2e542d2ff1d9dcb312b9;p=awesomized%2Flibmemcached

diff --git a/src/bin/common/options.hpp b/src/bin/common/options.hpp
index 980ca38d..93275b33 100644
--- a/src/bin/common/options.hpp
+++ b/src/bin/common/options.hpp
@@ -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/ |
     +--------------------------------------------------------------------+
 */
 
@@ -24,12 +24,7 @@
 #include <vector>
 
 #include "libmemcached/common.h"
-
-#ifdef HAVE_GETOPT_H
-#  include <getopt.h>
-#elif defined _MSC_VER
-#  include "win32/getopt.h"
-#endif
+#include "p9y/getopt.hpp"
 
 class client_options {
 public:
@@ -100,9 +95,10 @@ public:
         .apply = [](const client_options &opt, const extended_option &ext, memcached_st *memc) {
       if (auto username = ext.arg) {
 #if !LIBMEMCACHED_WITH_SASL_SUPPORT
+          (void) memc;
           if (!opt.isset("quiet")) {
             std::cerr
-                << "SASL username was supplied, but binary was not built with SASL support.\n";
+                << "SASL username '" << username << "' was supplied, but binary was not built with SASL support.\n";
           }
           return false;
 #else