Print this page
cstyle sort of updates
7127 remove -Wno-missing-braces from Makefile.uts
@@ -431,14 +431,14 @@
static int _sd_cctl_valid(_sd_cctl_t *);
#endif
static
nsc_def_t _sdbc_fd_def[] = {
- "Attach", (uintptr_t)sdbc_fd_attach_cd, 0,
- "Detach", (uintptr_t)sdbc_fd_detach_cd, 0,
- "Flush", (uintptr_t)sdbc_fd_flush_cd, 0,
- 0, 0, 0
+ { "Attach", (uintptr_t)sdbc_fd_attach_cd, 0 },
+ { "Detach", (uintptr_t)sdbc_fd_detach_cd, 0 },
+ { "Flush", (uintptr_t)sdbc_fd_flush_cd, 0 },
+ { NULL, (uintptr_t)NULL, 0 }
};
/*
* _sdbc_cache_configure - initialize cache blocks, queues etc.
@@ -2098,11 +2098,11 @@
int sts, stall;
_sd_cctl_t *centry = NULL;
_sd_cctl_t *lentry = NULL;
_sd_cctl_t *ioent = NULL;
_sd_cctl_t *last_ioent = NULL;
- sdbc_allocbuf_t alloc_tok = {0};
+ sdbc_allocbuf_t alloc_tok = {{(intptr_t)NULL}};
int this_entry_type = 0;
nsc_size_t request_blocks = 0; /* number of cache blocks required */
int pageio;
handle->bh_flag |= NSC_HACTIVE;
@@ -2538,11 +2538,11 @@
int stall, pageio;
unsigned char cc_flag;
int this_entry_type;
int locked = 0;
nsc_size_t dmchain_request_blocks; /* size of dmchain in cache blocks */
- sdbc_allocbuf_t alloc_tok = {0};
+ sdbc_allocbuf_t alloc_tok = {{(intptr_t)NULL}};
int min_frag = 0; /* frag statistics */
int max_frag = 0; /* frag statistics */
int nfrags = 0; /* frag statistics */
#ifdef DEBUG
int err = 0;
@@ -4142,11 +4142,11 @@
* ALLOC_NOWAIT set.
*/
_sd_cctl_t *
sdbc_centry_alloc_blks(int cd, nsc_off_t cblk, nsc_size_t reqblks, int flag)
{
- sdbc_allocbuf_t alloc_tok = {0}; /* must be 0 */
+ sdbc_allocbuf_t alloc_tok = {{(intptr_t)NULL}}; /* must be NULL */
int stall = 0;
_sd_cctl_t *centry = NULL;
_sd_cctl_t *lentry = NULL;
_sd_cctl_t *anchor = NULL;
_sd_cctl_t *next_centry;
@@ -7083,33 +7083,33 @@
}
}
nsc_def_t _sd_sdbc_def[] = {
- "Open", (uintptr_t)_sd_open_io, 0,
- "Close", (uintptr_t)_sd_close_io, 0,
- "Attach", (uintptr_t)_sdbc_io_attach_cd, 0,
- "Detach", (uintptr_t)_sdbc_io_detach_cd, 0,
- "AllocBuf", (uintptr_t)_sd_alloc_buf, 0,
- "FreeBuf", (uintptr_t)_sd_free_buf, 0,
- "Read", (uintptr_t)_sd_read, 0,
- "Write", (uintptr_t)_sd_write, 0,
- "Zero", (uintptr_t)_sd_zero, 0,
- "Copy", (uintptr_t)_sd_copy, 0,
- "CopyDirect", (uintptr_t)_sd_copy_direct, 0,
- "Uncommit", (uintptr_t)_sd_uncommit, 0,
- "AllocHandle", (uintptr_t)_sd_alloc_handle, 0,
- "FreeHandle", (uintptr_t)_sd_free_handle, 0,
- "Discard", (uintptr_t)_sd_discard_pinned, 0,
- "Sizes", (uintptr_t)_sd_cache_sizes, 0,
- "GetPinned", (uintptr_t)_sd_get_pinned, 0,
- "NodeHints", (uintptr_t)_sd_node_hint_caller, 0,
- "PartSize", (uintptr_t)_sd_get_partsize, 0,
- "MaxFbas", (uintptr_t)_sd_get_maxfbas, 0,
- "Control", (uintptr_t)_sd_control, 0,
- "Provide", NSC_CACHE, 0,
- 0, 0, 0
+ { "Open", (uintptr_t)_sd_open_io, 0 },
+ { "Close", (uintptr_t)_sd_close_io, 0 },
+ { "Attach", (uintptr_t)_sdbc_io_attach_cd, 0 },
+ { "Detach", (uintptr_t)_sdbc_io_detach_cd, 0 },
+ { "AllocBuf", (uintptr_t)_sd_alloc_buf, 0 },
+ { "FreeBuf", (uintptr_t)_sd_free_buf, 0 },
+ { "Read", (uintptr_t)_sd_read, 0 },
+ { "Write", (uintptr_t)_sd_write, 0 },
+ { "Zero", (uintptr_t)_sd_zero, 0 },
+ { "Copy", (uintptr_t)_sd_copy, 0 },
+ { "CopyDirect", (uintptr_t)_sd_copy_direct, 0 },
+ { "Uncommit", (uintptr_t)_sd_uncommit, 0 },
+ { "AllocHandle", (uintptr_t)_sd_alloc_handle, 0 },
+ { "FreeHandle", (uintptr_t)_sd_free_handle, 0 },
+ { "Discard", (uintptr_t)_sd_discard_pinned, 0 },
+ { "Sizes", (uintptr_t)_sd_cache_sizes, 0 },
+ { "GetPinned", (uintptr_t)_sd_get_pinned, 0 },
+ { "NodeHints", (uintptr_t)_sd_node_hint_caller, 0 },
+ { "PartSize", (uintptr_t)_sd_get_partsize, 0 },
+ { "MaxFbas", (uintptr_t)_sd_get_maxfbas, 0 },
+ { "Control", (uintptr_t)_sd_control, 0 },
+ { "Provide", NSC_CACHE, 0 },
+ { NULL, (uintptr_t)NULL, 0 }
};
/*
* do the SD_GET_CD_CLUSTER_DATA ioctl (get the global filename data)
*/