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

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/avs/ns/nsctl/nsc_disk.c
          +++ new/usr/src/uts/common/avs/ns/nsctl/nsc_disk.c
↓ open down ↓ 35 lines elided ↑ open up ↑
  36   36  
  37   37  #define __NSC_GEN__
  38   38  #include "nsc_dev.h"
  39   39  #include "nsc_disk.h"
  40   40  #include "../nsctl.h"
  41   41  
  42   42  
  43   43  #define _I(x)   (((long)(&((nsc_io_t *)0)->x))/sizeof (long))
  44   44  
  45   45  nsc_def_t _nsc_disk_def[] = {
  46      -        "UserRead",     (uintptr_t)nsc_ioerr,   _I(uread),
  47      -        "UserWrite",    (uintptr_t)nsc_ioerr,   _I(uwrite),
  48      -        "PartSize",     (uintptr_t)nsc_null,    _I(partsize),
  49      -        "MaxFbas",      (uintptr_t)nsc_null,    _I(maxfbas),
  50      -        "Control",      (uintptr_t)nsc_ioerr,   _I(control),
  51      -        0,              0,              0
       46 +        { "UserRead",   (uintptr_t)nsc_ioerr,   _I(uread) },
       47 +        { "UserWrite",  (uintptr_t)nsc_ioerr,   _I(uwrite) },
       48 +        { "PartSize",   (uintptr_t)nsc_null,    _I(partsize) },
       49 +        { "MaxFbas",    (uintptr_t)nsc_null,    _I(maxfbas) },
       50 +        { "Control",    (uintptr_t)nsc_ioerr,   _I(control) },
       51 +        { NULL,         (uintptr_t)NULL,        0 }
  52   52  };
  53   53  
  54   54  
  55   55  extern nsc_mem_t *_nsc_local_mem;
  56   56  
  57   57  static int _nsc_uread(dev_t, uio_t *, cred_t *, nsc_fd_t *);
  58   58  static int _nsc_uwrite(dev_t, uio_t *, cred_t *, nsc_fd_t *);
  59   59  static int _nsc_rw_uio(nsc_fd_t *, uio_t *, uio_rw_t);
  60   60  
  61   61  static int _nsc_free_dhandle(nsc_dbuf_t *);
↓ open down ↓ 493 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX