zfs-patches/0025-zhack-fix-getopt-return-type.patch

   1 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
   2 From: Nathaniel Wesley Filardo
   3  <VP331RHQ115POU58JFRLKB7OPA0L18E3@cmx.ietfng.org>
   4 Date: Tue, 9 Jan 2018 14:14:45 -0500
   5 Subject: [PATCH] zhack: fix getopt return type
   6 MIME-Version: 1.0
   7 Content-Type: text/plain; charset=UTF-8
   8 Content-Transfer-Encoding: 8bit
   9
  10 This fixes zhack's command processing on ARM.  On ARM char
  11 is unsigned, and so, in promotion to an int, it will never
  12 compare equal to -1.
  13
  14 Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
  15 Signed-off-by: Nathaniel Wesley Filardo <nwf@cs.jhu.edu>
  16 Closes #7016
  17 (cherry picked from commit a2ee6568c604fb455d6ee7fa51728fb2bc700dac)
  18 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
  19 ---
  20  cmd/zhack/zhack.c | 6 +++---
  21  1 file changed, 3 insertions(+), 3 deletions(-)
  22
  23 diff --git a/cmd/zhack/zhack.c b/cmd/zhack/zhack.c
  24 index 70f88fc69..e15af8f4e 100644
  25 --- a/cmd/zhack/zhack.c
  26 +++ b/cmd/zhack/zhack.c
  27 @@ -268,7 +268,7 @@ zhack_feature_enable_sync(void *arg, dmu_tx_t *tx)
  28  static void
  29  zhack_do_feature_enable(int argc, char **argv)
  30  {
  31 -       char c;
  32 +       int c;
  33         char *desc, *target;
  34         spa_t *spa;
  35         objset_t *mos;
  36 @@ -363,7 +363,7 @@ feature_decr_sync(void *arg, dmu_tx_t *tx)
  37  static void
  38  zhack_do_feature_ref(int argc, char **argv)
  39  {
  40 -       char c;
  41 +       int c;
  42         char *target;
  43         boolean_t decr = B_FALSE;
  44         spa_t *spa;
  45 @@ -483,7 +483,7 @@ main(int argc, char **argv)
  46         char *path[MAX_NUM_PATHS];
  47         const char *subcommand;
  48         int rv = 0;
  49 -       char c;
  50 +       int c;
  51
  52         g_importargs.path = path;
  53
  54 --
  55 2.14.2
  56