Print this page
7127  remove -Wno-missing-braces from Makefile.uts

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/fs/hsfs/hsfs_subr.c
          +++ new/usr/src/uts/common/fs/hsfs/hsfs_subr.c
↓ open down ↓ 17 lines elided ↑ open up ↑
  18   18   *
  19   19   * CDDL HEADER END
  20   20   */
  21   21  /*
  22   22   * Miscellaneous support subroutines for High Sierra filesystem
  23   23   *
  24   24   * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  25   25   * Use is subject to license terms.
  26   26   */
  27   27  
  28      -#pragma ident   "%Z%%M% %I%     %E% SMI"
  29      -
  30   28  #include <sys/types.h>
  31   29  #include <sys/param.h>
  32   30  #include <sys/time.h>
  33   31  #include <sys/cmn_err.h>
  34   32  #include <sys/systm.h>
  35   33  #include <sys/sysmacros.h>
  36   34  #include <sys/buf.h>
  37   35  #include <sys/conf.h>
  38   36  #include <sys/user.h>
  39   37  #include <sys/vfs.h>
↓ open down ↓ 30 lines elided ↑ open up ↑
  70   68   * once per mount.  Indexed by HSFS_ERR values (defined in hsfs_node.h).
  71   69   */
  72   70  struct hsfs_error {
  73   71          char    *hdr_text;      /* msg prefix: general error type */
  74   72                                  /* must contain %s for mnt pt */
  75   73          char    *err_text;      /* specific error message */
  76   74          uchar_t multiple;       /* > 1 such error per fs possible? */
  77   75          uchar_t n_printf_args;  /* if err_text printf-like, # addtl args */
  78   76  } hsfs_error[] = {
  79   77          /* HSFS_ERR_TRAILING_JUNK */
  80      -        "hsfs: Warning: the file system mounted on %s "
       78 +        {   "hsfs: Warning: the file system mounted on %s "
  81   79                  "does not conform to the ISO-9660 specification:",
  82      -        "trailing blanks or null characters in file or directory name.\n",
  83      -        1, 0,
       80 +            "trailing blanks or null characters in file or directory name.\n",
       81 +            1, 0 },
  84   82          /* HSFS_ERR_LOWER_CASE_NM */
  85      -        "hsfs: Warning: the file system mounted on %s "
       83 +        {   "hsfs: Warning: the file system mounted on %s "
  86   84                  "does not conform to the ISO-9660 specification:",
  87      -        "lower case characters in file or directory name.\n",
  88      -        1, 0,
       85 +            "lower case characters in file or directory name.\n",
       86 +            1, 0 },
  89   87          /* HSFS_ERR_BAD_ROOT_DIR */
  90      -        "hsfs: Warning: the file system mounted on %s "
       88 +        {   "hsfs: Warning: the file system mounted on %s "
  91   89                  "does not conform to the ISO-9660 specification:",
  92      -        "invalid root directory.\n",
  93      -        0,  0,
       90 +            "invalid root directory.\n",
       91 +            0, 0 },
  94   92          /* HSFS_ERR_UNSUP_TYPE */
  95      -        "hsfs: Warning: the file system mounted on %s "
       93 +        {   "hsfs: Warning: the file system mounted on %s "
  96   94                  "contains a file or directory with an unsupported type:",
  97      -        " 0x%x.\n",
  98      -        1, 1,
       95 +            " 0x%x.\n",
       96 +            1, 1 },
  99   97          /* HSFS_ERR_BAD_FILE_LEN */
 100      -        "hsfs: Warning: file system mounted on %s "
       98 +        {   "hsfs: Warning: file system mounted on %s "
 101   99                  "does not conform to the ISO-9660 specification:",
 102      -        "file name length greater than max allowed\n",
 103      -        1, 0,
      100 +            "file name length greater than max allowed\n",
      101 +            1, 0 },
 104  102          /* HSFS_ERR_BAD_JOLIET_FILE_LEN */
 105      -        "hsfs: Warning: file system mounted on %s "
      103 +        {   "hsfs: Warning: file system mounted on %s "
 106  104                  "does not conform to the Joliet specification:",
 107      -        "file name length greater than max allowed\n",
 108      -        1, 0,
      105 +            "file name length greater than max allowed\n",
      106 +            1, 0 },
 109  107          /* HSFS_ERR_TRUNC_JOLIET_FILE_LEN */
 110      -        "hsfs: Warning: file system mounted on %s "
      108 +        {   "hsfs: Warning: file system mounted on %s "
 111  109                  "does not conform to the Joliet specification:",
 112      -        "file name length greater than MAXNAMELEN (truncated)\n",
 113      -        1, 0,
      110 +            "file name length greater than MAXNAMELEN (truncated)\n",
      111 +            1, 0 },
 114  112          /* HSFS_ERR_BAD_DIR_ENTRY */
 115      -        "hsfs: Warning: file system mounted on %s "
      113 +        {   "hsfs: Warning: file system mounted on %s "
 116  114                  "has inconsistent data:",
 117      -        "invalid directory or file name length (ignored)\n",
 118      -        1, 0,
      115 +            "invalid directory or file name length (ignored)\n",
      116 +            1, 0 },
 119  117          /* HSFS_ERR_NEG_SUA_LEN */
 120      -        "hsfs: Warning: file system mounted on %s "
      118 +        {   "hsfs: Warning: file system mounted on %s "
 121  119                  "has inconsistent Rock Ridge data:",
 122      -        "negative SUA len\n",
 123      -        1, 0,
      120 +            "negative SUA len\n",
      121 +            1, 0 },
 124  122          /* HSFS_ERR_BAD_SUA_LEN */
 125      -        "hsfs: Warning: file system mounted on %s "
      123 +        {   "hsfs: Warning: file system mounted on %s "
 126  124                  "has inconsistent Rock Ridge data:",
 127      -        "SUA len too big\n",
 128      -        1, 0,
      125 +            "SUA len too big\n",
      126 +            1, 0 }
 129  127  };
 130  128  
 131  129  /*
 132  130   * Local datatype for defining tables of (Offset, Name) pairs for
 133  131   * kstats.
 134  132   */
 135  133  typedef struct {
 136  134          offset_t        index;
 137  135          char            *name;
 138  136  } hsfs_ksindex_t;
↓ open down ↓ 308 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX