Merge branch 'runtest' into v1.x

[awesomized/libmemcached] / src / bin / memerror.cc

diff --git a/src/bin/memerror.cc b/src/bin/memerror.cc
index 96c068f56ab1246f99baaa4f0b879337e814ed15..14a70c29b0ae506132506a93e29a022569702fde 100644 (file)
--- a/src/bin/memerror.cc
+++ b/src/bin/memerror.cc
@@ -1,14 +1,18 @@
-/* LibMemcached
- * Copyright (C) 2011-2012 Data Differential, http://datadifferential.com/
- * Copyright (C) 2006-2009 Brian Aker
- * All rights reserved.
- *
- * Use and distribution licensed under the BSD license.  See
- * the COPYING file in the parent directory for full text.
- *
- * Summary:
- *
- */
+/*
+    +--------------------------------------------------------------------+
+    | libmemcached - 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.    |
+    | You should have received a copy of the license in a bundled file   |
+    | named LICENSE; in case you did not receive a copy you can review   |
+    | 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>                |
+    +--------------------------------------------------------------------+
+*/
+
 #include "mem_config.h"
 
 #include <cerrno>
@@ -25,43 +29,34 @@
 
 #include "utilities.h"
 
-#define PROGRAM_NAME "memerror"
+#define PROGRAM_NAME        "memerror"
 #define PROGRAM_DESCRIPTION "Translate a memcached errror code into a string."
 
-
 /* Prototypes */
 void options_parse(int argc, char *argv[]);
 
-int main(int argc, char *argv[])
-{
+int main(int argc, char *argv[]) {
   options_parse(argc, argv);
 
-  if (argc < 2)
-  {
+  if (argc < 2) {
     return EXIT_FAILURE;
   }
 
-  while (optind < argc)
-  {
-    errno= 0;
+  while (optind < argc) {
+    errno = 0;
     char *nptr;
-    unsigned long value= strtoul(argv[optind], &nptr, 10);
+    unsigned long value = strtoul(argv[optind], &nptr, 10);
 
-    if ((errno != 0) or
-        (nptr == argv[optind] and value == 0) or
-        (value == ULONG_MAX and errno == ERANGE) or
-        (value == 0 and errno == EINVAL))
+    if ((errno) or (nptr == argv[optind] and value == 0)
+        or (value == ULONG_MAX and errno == ERANGE) or (value == 0 and errno == EINVAL))
     {
       std::cerr << "strtoul() was unable to parse given value" << std::endl;
       return EXIT_FAILURE;
     }
 
-    if (value < MEMCACHED_MAXIMUM_RETURN)
-    {
-      std::cout << memcached_strerror(NULL, (memcached_return_t)value) << std::endl;
-    }
-    else
-    {
+    if (value < MEMCACHED_MAXIMUM_RETURN) {
+      std::cout << memcached_strerror(NULL, (memcached_return_t) value) << std::endl;
+    } else {
       std::cerr << memcached_strerror(NULL, MEMCACHED_MAXIMUM_RETURN) << std::endl;
       return EXIT_FAILURE;
     }
@@ -72,38 +67,32 @@ int main(int argc, char *argv[])
   return EXIT_SUCCESS;
 }
 
-
-void options_parse(int argc, char *argv[])
-{
-  static struct option long_options[]=
-    {
-      {(OPTIONSTRING)"version", no_argument, NULL, OPT_VERSION},
-      {(OPTIONSTRING)"help", no_argument, NULL, OPT_HELP},
+void options_parse(int argc, char *argv[]) {
+  static struct option long_options[] = {
+      {(OPTIONSTRING) "version", no_argument, NULL, OPT_VERSION},
+      {(OPTIONSTRING) "help", no_argument, NULL, OPT_HELP},
       {0, 0, 0, 0},
-    };
-
-  bool opt_version= false;
-  bool opt_help= false;
-  int option_index= 0;
-  while (1) 
-  {
-    int option_rv= getopt_long(argc, argv, "Vhvds:", long_options, &option_index);
-    if (option_rv == -1)
-    {
+  };
+
+  bool opt_version = false;
+  bool opt_help = false;
+  int option_index = 0;
+  while (1) {
+    int option_rv = getopt_long(argc, argv, "Vhvds:", long_options, &option_index);
+    if (option_rv == -1) {
       break;
     }
 
-    switch (option_rv)
-    {
+    switch (option_rv) {
     case 0:
       break;
 
     case OPT_VERSION: /* --version or -V */
-      opt_version= true;
+      opt_version = true;
       break;
 
     case OPT_HELP: /* --help or -h */
-      opt_help= true;
+      opt_help = true;
       break;
 
     case '?':
@@ -115,14 +104,12 @@ void options_parse(int argc, char *argv[])
     }
   }
 
-  if (opt_version)
-  {
+  if (opt_version) {
     version_command(PROGRAM_NAME);
     exit(EXIT_SUCCESS);
   }
 
-  if (opt_help)
-  {
+  if (opt_help) {
     help_command(PROGRAM_NAME, PROGRAM_DESCRIPTION, long_options, NULL);
     exit(EXIT_SUCCESS);
   }