Print this page
10131 fmtmsg is bitwise, not streetwise

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/fmtmsg/main.c
          +++ new/usr/src/cmd/fmtmsg/main.c
↓ open down ↓ 20 lines elided ↑ open up ↑
  21   21   */
  22   22  
  23   23  /*
  24   24   * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
  25   25   * Use is subject to license terms.
  26   26   */
  27   27  
  28   28  /*      Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
  29   29  /*        All Rights Reserved   */
  30   30  
  31      -#pragma ident   "%Z%%M% %I%     %E% SMI"
       31 +/*
       32 + * Copyright (c) 2018, Joyent, Inc.
       33 + */
  32   34  
  33      -
  34   35  /*
  35   36   * fmtmsg.c
  36   37   *
  37   38   * Contains:
  38   39   *      fmtmsg          Command that writes a message in the standard
  39   40   *                      message format.  May in future make these
  40   41   *                      messages available for logging.
  41   42   */
  42   43  
  43   44  
↓ open down ↓ 672 lines elided ↑ open up ↑
 716  717              if (errflg) {
 717  718                  (void) snprintf(msgbuf, sizeof (msgbuf),
 718  719                          "Invalid subclass: %s", ustr);
 719  720                  (void) fmtmsg(CLASS, labelbuf, MM_ERROR, msgbuf,
 720  721                                MM_NULLACT, MM_NULLTAG);
 721  722                  exit(1);
 722  723              }
 723  724  
 724  725          }
 725  726  
 726      -        if (!c_seen & !u_seen) class = MM_NULLMC;
      727 +        if (!c_seen && !u_seen) class = MM_NULLMC;
 727  728  
 728  729  
 729  730  
 730  731          /*
 731  732           * Severity.
 732  733           */
 733  734  
 734  735          if (s_seen) {
 735  736  
 736  737              /* If the severity is specified as a number, use that value */
↓ open down ↓ 91 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX