Print this page
10921 mdb_nicenum() needs smatch fix

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/mdb/common/mdb/mdb_modapi.c
          +++ new/usr/src/cmd/mdb/common/mdb/mdb_modapi.c
↓ open down ↓ 15 lines elided ↑ open up ↑
  16   16   * fields enclosed by brackets "[]" replaced with your own identifying
  17   17   * information: Portions Copyright [yyyy] [name of copyright owner]
  18   18   *
  19   19   * CDDL HEADER END
  20   20   */
  21   21  
  22   22  /*
  23   23   * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
  24   24   * Copyright (c) 2013 by Delphix. All rights reserved.
  25   25   * Copyright 2016 Nexenta Systems, Inc.  All rights reserved.
       26 + * Copyright 2019 Joyent, Inc.
  26   27   */
  27   28  
  28   29  #include <mdb/mdb_modapi.h>
  29   30  #include <mdb/mdb_module.h>
  30   31  #include <mdb/mdb_string.h>
  31   32  #include <mdb/mdb_debug.h>
  32   33  #include <mdb/mdb_callb.h>
  33   34  #include <mdb/mdb_dump.h>
  34   35  #include <mdb/mdb_err.h>
  35   36  #include <mdb/mdb_io.h>
↓ open down ↓ 49 lines elided ↑ open up ↑
  85   86          }
  86   87  
  87   88          u = &" \0K\0M\0G\0T\0P\0E\0"[index*2];
  88   89  
  89   90          if (index == 0) {
  90   91                  (void) mdb_snprintf(buf, MDB_NICENUM_BUFLEN, "%llu",
  91   92                      (u_longlong_t)n);
  92   93          } else if (n < 10 && (num & (num - 1)) != 0) {
  93   94                  (void) mdb_snprintfrac(buf, MDB_NICENUM_BUFLEN,
  94   95                      num, 1ULL << 10 * index, 2);
  95      -                strcat(buf, u);
       96 +                (void) strcat(buf, u);
  96   97          } else if (n < 100 && (num & (num - 1)) != 0) {
  97   98                  (void) mdb_snprintfrac(buf, MDB_NICENUM_BUFLEN,
  98   99                      num, 1ULL << 10 * index, 1);
  99      -                strcat(buf, u);
      100 +                (void) strcat(buf, u);
 100  101          } else {
 101  102                  (void) mdb_snprintf(buf, MDB_NICENUM_BUFLEN, "%llu%s",
 102  103                      (u_longlong_t)n, u);
 103  104          }
 104  105  }
 105  106  
 106  107  ssize_t
 107  108  mdb_vread(void *buf, size_t nbytes, uintptr_t addr)
 108  109  {
 109  110          ssize_t rbytes = mdb_tgt_vread(mdb.m_target, buf, nbytes, addr);
↓ open down ↓ 972 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX