osdyson
/
illumos-packaging
mirror of https://git.osdyson.ru/illumos/illumos-packaging.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

mdb (4.3+1) unstable; urgency=medium 

* Fix that mdb cannot find its modules on livecd (mdb-root-detect.patch)
  * Build almost all modules for kernel and user space
  * Stop building 32-bit mdb
  * New package kmdb
This commit is contained in:
Igor Pashev 2014-05-03 17:54:48 +04:00
parent f249ba6a59
commit b5fb8e30bc
45 changed files with 3469 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mdb/debian/changelog
View File

@ -1,10 +1,11 @@
mdb (4.3+1) UNRELEASED; urgency=medium
mdb (4.3+1) unstable; urgency=medium
* Fix that mdb cannot find its modules on livecd (mdb-root-detect.patch)
* Build almost all modules for kernel and user space
* Stop building 32-bit mdb
* New package kmdb
-- Igor Pashev <pashev.igor@gmail.com> Fri, 02 May 2014 15:30:48 +0400
-- Igor Pashev <pashev.igor@gmail.com> Sat, 03 May 2014 17:39:12 +0400
mdb (4.3) unstable; urgency=medium

12
mdb/debian/control
View File

@ -40,6 +40,18 @@ Description: an extensible, low-level modular debugger
editing of the live operating system, operating system crashdumps,
user processes, user process core dumps, and object files.
Package: kmdb
Architecture: illumos-any
Section: kernel
Depends: ${misc:Depends},
Replaces: illumos-kernel (<< 4.3+3)
Description: in situ kernel debugger
kmdb is an interactive kernel debugger which implements the user interface
and functionality of mdb in a live kernel context. kmdb provides features
that allow for the control of kernel execution and for the inspection and
modification of live kernel state. kmdb can be loaded at the beginning of
a boot session or after the system is booted.
Package: mdb-kvm
Architecture: illumos-any
Depends: ${shlibs:Depends}, ${misc:Depends}, mdb (>= ${binary:Version})

5
mdb/debian/kmdb.install Normal file
View File

@ -0,0 +1,5 @@
kernel/kmdb/amd64
kernel/misc/amd64
kmdb kernel/drv/amd64
usr/kernel/kmdb/amd64
usr/src/uts/common/kmdb/kmdb.conf kernel/drv

2
mdb/debian/kmdb.manpages Normal file
View File

@ -0,0 +1,2 @@
usr/src/man/man1/kmdb.1
usr/src/man/man7d/kmdb.7d

14
mdb/debian/kmdb.postinst Normal file
View File

@ -0,0 +1,14 @@
#!/bin/sh
set -e
case "$1" in
configure)
dpkg-trigger boot-archive || true;
;;
*)
;;
esac
exit 0

13
mdb/debian/kmdb.postrm Normal file
View File

@ -0,0 +1,13 @@
#!/bin/sh
set -e
case "$1" in
remove)
dpkg-trigger boot-archive || true;
;;
*)
;;
esac
exit 0

31
mdb/debian/patches/mdb-cpc-NULL.patch Normal file
View File

@ -0,0 +1,31 @@
Index: mdb/usr/src/cmd/mdb/common/modules/cpc/cpc.c
===================================================================
--- mdb.orig/usr/src/cmd/mdb/common/modules/cpc/cpc.c 2014-03-01 16:18:00.000000000 +0400
+++ mdb/usr/src/cmd/mdb/common/modules/cpc/cpc.c 2014-05-03 12:09:20.365862465 +0400
@@ -156,7 +156,7 @@
{
struct cpc_ctx_aux *cca;
- if (wsp->walk_addr != NULL) {
+ if (wsp->walk_addr != 0) {
mdb_warn("only global cpc_ctx walk supported\n");
return (WALK_ERR);
}
@@ -171,7 +171,7 @@
}
wsp->walk_data = cca;
- wsp->walk_addr = NULL;
+ wsp->walk_addr = 0;
return (WALK_NEXT);
}
@@ -182,7 +182,7 @@
kcpc_ctx_t ctx;
struct cpc_ctx_aux *cca = wsp->walk_data;
- while (wsp->walk_addr == NULL) {
+ while (wsp->walk_addr == 0) {
if (cca->cca_bucket == KCPC_HASH_BUCKETS)
return (WALK_DONE);
wsp->walk_addr = cca->cca_hash[cca->cca_bucket++];

103
mdb/debian/patches/mdb-crypto-NULL.patch Normal file
View File

@ -0,0 +1,103 @@
Index: mdb/usr/src/cmd/mdb/common/modules/crypto/impl.c
===================================================================
--- mdb.orig/usr/src/cmd/mdb/common/modules/crypto/impl.c 2014-03-01 16:18:00.000000000 +0400
+++ mdb/usr/src/cmd/mdb/common/modules/crypto/impl.c 2014-05-03 12:10:47.251042273 +0400
@@ -424,7 +424,7 @@
{
int status;
- if (wsp->walk_addr == NULL) /* then we're done */
+ if (wsp->walk_addr == 0) /* then we're done */
return (WALK_DONE);
#ifdef DEBUG
else
@@ -468,7 +468,7 @@
kcf_soft_conf_entry_t *ptr;
if ((flags & DCMD_ADDRSPEC) == DCMD_ADDRSPEC) {
- if (addr == NULL) /* not allowed with DCMD_ADDRSPEC */
+ if (addr == 0) /* not allowed with DCMD_ADDRSPEC */
return (DCMD_USAGE);
else
ptr = (kcf_soft_conf_entry_t *)addr;
Index: mdb/usr/src/cmd/mdb/common/modules/crypto/sched_impl.c
===================================================================
--- mdb.orig/usr/src/cmd/mdb/common/modules/crypto/sched_impl.c 2014-03-01 16:18:00.000000000 +0400
+++ mdb/usr/src/cmd/mdb/common/modules/crypto/sched_impl.c 2014-05-03 12:11:49.083799111 +0400
@@ -251,7 +251,7 @@
return (WALK_ERR);
}
if ((wsp->walk_addr = (use_first ? (uintptr_t)gswq_copy.gs_first :
- (uintptr_t)gswq_copy.gs_last)) == NULL) {
+ (uintptr_t)gswq_copy.gs_last)) == 0) {
mdb_printf("Global swq is empty\n");
return (WALK_DONE);
}
@@ -282,7 +282,7 @@
{
kcf_areq_node_t *adn;
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
mdb_warn("must give kcf_areq_node address\n");
return (WALK_ERR);
}
@@ -334,7 +334,7 @@
int status;
kcf_areq_node_t *ptr;
- if (wsp->walk_addr == NULL) /* then we're done */
+ if (wsp->walk_addr == 0) /* then we're done */
return (WALK_DONE);
ptr = wsp->walk_data;
@@ -351,19 +351,19 @@
switch (type) {
case IDNEXT:
if ((wsp->walk_addr =
- (uintptr_t)ptr->an_idnext) == NULL)
+ (uintptr_t)ptr->an_idnext) == 0)
return (WALK_DONE);
break;
case IDPREV:
if ((wsp->walk_addr =
- (uintptr_t)ptr->an_idprev) == NULL)
+ (uintptr_t)ptr->an_idprev) == 0)
return (WALK_DONE);
break;
case CTXCHAIN:
if ((wsp->walk_addr =
- (uintptr_t)ptr->an_ctxchain_next) == NULL)
+ (uintptr_t)ptr->an_ctxchain_next) == 0)
return (WALK_DONE);
break;
@@ -425,7 +425,7 @@
wsp->walk_cbdata);
if ((wsp->walk_addr = (use_next ? (uintptr_t)ptr->an_next :
- (uintptr_t)ptr->an_prev)) == NULL)
+ (uintptr_t)ptr->an_prev)) == 0)
return (WALK_DONE);
return (status);
@@ -556,7 +556,7 @@
int i;
int needhdr = TRUE;
- if (addr == NULL) {
+ if (addr == 0) {
mdb_printf("kcf_reqid_table[%d] = NULL\n", data->rd_cur_index);
return (WALK_NEXT);
}
@@ -585,7 +585,7 @@
mdb_printf("DEBUG: node_addr = %p\n", node_addr);
#endif
- if (node_addr == NULL)
+ if (node_addr == 0)
break; /* skip */
if (mdb_vread(&node, sizeof (kcf_areq_node_t), node_addr)

189
mdb/debian/patches/mdb-dtrace-NULL.patch Normal file
View File

@ -0,0 +1,189 @@
Index: mdb/usr/src/cmd/mdb/common/modules/dtrace/dtrace.c
===================================================================
--- mdb.orig/usr/src/cmd/mdb/common/modules/dtrace/dtrace.c 2014-03-01 16:18:00.000000000 +0400
+++ mdb/usr/src/cmd/mdb/common/modules/dtrace/dtrace.c 2014-05-03 12:14:49.691776134 +0400
@@ -52,7 +52,7 @@
int
id2probe(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
{
- uintptr_t probe = NULL;
+ uintptr_t probe = 0;
uintptr_t probes;
if (!(flags & DCMD_ADDRSPEC))
@@ -114,7 +114,7 @@
return (-1);
}
- if (addr == NULL) {
+ if (addr == 0) {
mdb_warn("epid %d doesn't match an ecb\n", epid);
return (-1);
}
@@ -135,7 +135,7 @@
* This is a little painful: in order to find the number of actions,
* we need to first walk through them.
*/
- for (ap = (uintptr_t)ecb.dte_action, nactions = 0; ap != NULL; ) {
+ for (ap = (uintptr_t)ecb.dte_action, nactions = 0; ap != 0; ) {
if (mdb_vread(&act, sizeof (act), ap) == -1) {
mdb_warn("failed to read action %p on ecb %p",
ap, addr);
@@ -154,7 +154,7 @@
epd->dtepd_uarg = ecb.dte_uarg;
epd->dtepd_size = ecb.dte_size;
- for (ap = (uintptr_t)ecb.dte_action, nactions = 0; ap != NULL; ) {
+ for (ap = (uintptr_t)ecb.dte_action, nactions = 0; ap != 0; ) {
if (mdb_vread(&act, sizeof (act), ap) == -1) {
mdb_warn("failed to read action %p on ecb %p",
ap, addr);
@@ -204,11 +204,11 @@
return (-1);
}
- if (paddr != NULL)
+ if (paddr != 0)
break;
}
- if (paddr == NULL) {
+ if (paddr == 0) {
errno = ESRCH;
return (-1);
}
@@ -274,7 +274,7 @@
return (-1);
}
- if (addr == NULL) {
+ if (addr == 0) {
mdb_warn("aggid %d doesn't match an aggregation\n", aggid);
return (-1);
}
@@ -809,7 +809,7 @@
return (-1);
}
- if (caddr == NULL)
+ if (caddr == 0)
return (-1);
if (mdb_vread(&c, sizeof (c), caddr) == -1) {
@@ -1176,7 +1176,7 @@
uintptr_t *hash, addr;
int i;
- if (wsp->walk_addr != NULL) {
+ if (wsp->walk_addr != 0) {
mdb_warn("dtrace_errhash walk only supports global walks\n");
return (WALK_ERR);
}
@@ -1276,7 +1276,7 @@
uint32_t next;
uintptr_t buffer;
- if (wsp->walk_addr != NULL) {
+ if (wsp->walk_addr != 0) {
mdb_warn("dtrace_helptrace only supports global walks\n");
return (WALK_ERR);
}
@@ -1286,7 +1286,7 @@
return (WALK_ERR);
}
- if (buffer == NULL) {
+ if (buffer == 0) {
mdb_warn("helper tracing is not enabled\n");
return (WALK_ERR);
}
@@ -1520,7 +1520,7 @@
minor_t max = 0;
dtrace_state_walk_t *dw;
- if (wsp->walk_addr != NULL) {
+ if (wsp->walk_addr != 0) {
mdb_warn("dtrace_state only supports global walks\n");
return (WALK_ERR);
}
@@ -1744,7 +1744,7 @@
dtrace_aggkey_data_t *data;
size_t hsize;
- if ((addr = wsp->walk_addr) == NULL) {
+ if ((addr = wsp->walk_addr) == 0) {
mdb_warn("dtrace_aggkey walk needs aggregation buffer\n");
return (WALK_ERR);
}
@@ -1788,7 +1788,7 @@
dtrace_aggkey_t key;
uintptr_t addr;
- while ((addr = data->dtakd_next) == NULL) {
+ while ((addr = data->dtakd_next) == 0) {
if (data->dtakd_ndx == data->dtakd_hashsize)
return (WALK_DONE);
@@ -1833,7 +1833,7 @@
size_t hsize;
GElf_Sym sym;
- if ((addr = wsp->walk_addr) == NULL) {
+ if ((addr = wsp->walk_addr) == 0) {
mdb_warn("dtrace_dynvar walk needs dtrace_dstate_t\n");
return (WALK_ERR);
}
@@ -2376,7 +2376,7 @@
dtrace_state_t state;
dtrace_ecb_walk_t *ecbwp;
- if ((addr = wsp->walk_addr) == NULL) {
+ if ((addr = wsp->walk_addr) == 0) {
mdb_warn("dtrace_ecb walk needs dtrace_state_t\n");
return (WALK_ERR);
}
@@ -2415,7 +2415,7 @@
return (WALK_ERR);
}
- if (ecbp == NULL)
+ if (ecbp == 0)
return (WALK_NEXT);
return (wsp->walk_callback(ecbp, NULL, wsp->walk_cbdata));
@@ -2571,7 +2571,7 @@
struct dev_info info;
pid_t pid = (pid_t)wsp->walk_addr;
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
mdb_warn("pid2state walk requires PID\n");
return (WALK_ERR);
}
@@ -2583,7 +2583,7 @@
return (DCMD_ERR);
}
- if ((proc = mdb_pid2proc(pid, NULL)) == NULL) {
+ if ((proc = mdb_pid2proc(pid, 0)) == 0) {
mdb_warn("PID 0t%d not found\n", pid);
return (DCMD_ERR);
}
@@ -2661,7 +2661,7 @@
dtrace_probe_t probe;
dtrace_probedesc_t pd;
- if (addr == NULL)
+ if (addr == 0)
return (WALK_ERR);
if (mdb_vread(&ecb, sizeof (dtrace_ecb_t), addr) == -1) {
@@ -2730,7 +2730,7 @@
continue;
}
- if (paddr == NULL)
+ if (paddr == 0)
continue;
pd.dtpd_id = i + 1;

22
mdb/debian/patches/mdb-fcip-NULL.patch Normal file
View File

@ -0,0 +1,22 @@
Index: mdb/usr/src/cmd/mdb/common/modules/fcip/fcip.c
===================================================================
--- mdb.orig/usr/src/cmd/mdb/common/modules/fcip/fcip.c 2014-03-01 16:18:00.000000000 +0400
+++ mdb/usr/src/cmd/mdb/common/modules/fcip/fcip.c 2014-05-03 12:16:03.578585322 +0400
@@ -42,7 +42,7 @@
static int
fcip_walk_i(mdb_walk_state_t *wsp)
{
- if (wsp->walk_addr == NULL &&
+ if (wsp->walk_addr == 0 &&
mdb_readvar(&wsp->walk_addr, "fcip_port_head") == -1) {
mdb_warn("failed to read 'fcip_port_head'");
return (WALK_ERR);
@@ -57,7 +57,7 @@
{
int status;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_DONE);
if (mdb_vread(wsp->walk_data, sizeof (fcip_port_info_t),

121
mdb/debian/patches/mdb-fcp-NULL.patch Normal file
View File

@ -0,0 +1,121 @@
Index: mdb/usr/src/cmd/mdb/common/modules/fcp/fcp.c
===================================================================
--- mdb.orig/usr/src/cmd/mdb/common/modules/fcp/fcp.c 2014-03-01 16:18:00.000000000 +0400
+++ mdb/usr/src/cmd/mdb/common/modules/fcp/fcp.c 2014-05-03 12:18:01.847931548 +0400
@@ -47,7 +47,7 @@
static int
fcp_walk_i(mdb_walk_state_t *wsp)
{
- if (wsp->walk_addr == NULL &&
+ if (wsp->walk_addr == 0 &&
mdb_readvar(&wsp->walk_addr, "fcp_port_head") == -1) {
mdb_warn("failed to read 'fcp_port_head'");
return (WALK_ERR);
@@ -62,7 +62,7 @@
{
int status;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_DONE);
if (mdb_vread(wsp->walk_data, sizeof (struct fcp_port),
@@ -186,7 +186,7 @@
static int
cmds_walk_i(mdb_walk_state_t *wsp)
{
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
mdb_warn("Can not perform global walk");
return (WALK_ERR);
}
@@ -213,7 +213,7 @@
{
int status;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_DONE);
if (mdb_vread(wsp->walk_data, sizeof (struct fcp_pkt),
@@ -248,7 +248,7 @@
static int
luns_walk_i(mdb_walk_state_t *wsp)
{
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
mdb_warn("Can not perform global walk");
return (WALK_ERR);
}
@@ -275,7 +275,7 @@
{
int status;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_DONE);
if (mdb_vread(wsp->walk_data, sizeof (struct fcp_lun),
@@ -310,7 +310,7 @@
static int
targets_walk_i(mdb_walk_state_t *wsp)
{
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
mdb_warn("Can not perform global walk\n");
return (WALK_ERR);
}
@@ -345,7 +345,7 @@
{
int status;
- if ((wsp->walk_addr == NULL) &&
+ if ((wsp->walk_addr == 0) &&
(tgt_hash_index >= (FCP_NUM_HASH - 1))) {
return (WALK_DONE);
}
@@ -362,7 +362,7 @@
wsp->walk_addr =
(uintptr_t)(((struct fcp_tgt *)wsp->walk_data)->tgt_next);
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
/*
* locate the next hash list
*/
@@ -403,7 +403,7 @@
static int
ipkt_walk_i(mdb_walk_state_t *wsp)
{
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
mdb_warn("The address of a fcp_port"
" structure must be given\n");
return (WALK_ERR);
@@ -432,7 +432,7 @@
{
int status;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_DONE);
if (mdb_vread(wsp->walk_data, sizeof (struct fcp_ipkt),
@@ -467,7 +467,7 @@
static int
pkt_walk_i(mdb_walk_state_t *wsp)
{
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
mdb_warn("The address of a fcp_port"
" structure must be given\n");
return (WALK_ERR);
@@ -496,7 +496,7 @@
{
int status;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_DONE);
if (mdb_vread(wsp->walk_data, sizeof (struct fcp_pkt),

148
mdb/debian/patches/mdb-fctl-NULL.patch Normal file
View File

@ -0,0 +1,148 @@
Index: mdb/usr/src/cmd/mdb/common/modules/fctl/fctl.c
===================================================================
--- mdb.orig/usr/src/cmd/mdb/common/modules/fctl/fctl.c 2014-03-01 16:18:00.000000000 +0400
+++ mdb/usr/src/cmd/mdb/common/modules/fctl/fctl.c 2014-05-03 12:20:18.747239584 +0400
@@ -71,7 +71,7 @@
static int
port_walk_i(mdb_walk_state_t *wsp)
{
- if (wsp->walk_addr == NULL &&
+ if (wsp->walk_addr == 0 &&
mdb_readvar(&wsp->walk_addr, "fctl_fca_portlist") == -1) {
mdb_warn("failed to read 'fctl_fca_portlist'");
return (WALK_ERR);
@@ -90,7 +90,7 @@
{
int status;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_DONE);
if (mdb_vread(wsp->walk_data, sizeof (fc_fca_port_t), wsp->walk_addr)
@@ -198,7 +198,7 @@
static int
ulp_walk_i(mdb_walk_state_t *wsp)
{
- if (wsp->walk_addr == NULL &&
+ if (wsp->walk_addr == 0 &&
mdb_readvar(&wsp->walk_addr, "fctl_ulp_list") == -1) {
mdb_warn("failed to read 'fctl_ulp_list'");
return (WALK_ERR);
@@ -215,7 +215,7 @@
{
int status;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_DONE);
if (mdb_vread(wsp->walk_data, sizeof (fc_ulp_list_t), wsp->walk_addr)
@@ -308,7 +308,7 @@
static int
ulpmod_walk_i(mdb_walk_state_t *wsp)
{
- if (wsp->walk_addr == NULL &&
+ if (wsp->walk_addr == 0 &&
mdb_readvar(&wsp->walk_addr, "fctl_ulp_modules") == -1) {
mdb_warn("failed to read 'fctl_ulp_modules'");
return (WALK_ERR);
@@ -325,7 +325,7 @@
{
int status;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_DONE);
if (mdb_vread(wsp->walk_data, sizeof (fc_ulp_module_t), wsp->walk_addr)
@@ -577,7 +577,7 @@
{
fc_local_port_t port;
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
mdb_warn("pd_by_pwwn walk doesn't support global walks\n");
return (WALK_ERR);
}
@@ -629,7 +629,7 @@
{
int status;
- if ((wsp->walk_addr == NULL) &&
+ if ((wsp->walk_addr == 0) &&
(pd_hash_index >= (PWWN_HASH_TABLE_SIZE - 1))) {
return (WALK_DONE);
}
@@ -646,7 +646,7 @@
wsp->walk_addr =
(uintptr_t)(((fc_remote_port_t *)wsp->walk_data)->pd_wwn_hnext);
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
/*
* Try the next hash list, if there is one.
*/
@@ -691,7 +691,7 @@
{
fc_local_port_t port;
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
mdb_warn("pd_by_did walk doesn't support global walks\n");
return (WALK_ERR);
}
@@ -742,7 +742,7 @@
{
int status;
- if ((wsp->walk_addr == NULL) &&
+ if ((wsp->walk_addr == 0) &&
(pd_hash_index >= (D_ID_HASH_TABLE_SIZE - 1))) {
return (WALK_DONE);
}
@@ -759,7 +759,7 @@
wsp->walk_addr =
(uintptr_t)(((fc_remote_port_t *)wsp->walk_data)->pd_did_hnext);
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
/*
* Try the next hash list, if there is one.
*/
@@ -1172,7 +1172,7 @@
static int
job_request_walk_i(mdb_walk_state_t *wsp)
{
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
mdb_warn("The address of a fc_local_port"
" structure must be given\n");
return (WALK_ERR);
@@ -1201,7 +1201,7 @@
{
int status;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_DONE);
if (mdb_vread(wsp->walk_data, sizeof (struct job_request),
@@ -1242,7 +1242,7 @@
static int
orphan_walk_i(mdb_walk_state_t *wsp)
{
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
mdb_warn("The address of a fc_local_port"
" structure must be given\n");
return (WALK_ERR);
@@ -1271,7 +1271,7 @@
{
int status;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_DONE);
if (mdb_vread(wsp->walk_data, sizeof (struct fc_orphan),

22
mdb/debian/patches/mdb-hook-NULL.patch Normal file
View File

@ -0,0 +1,22 @@
Index: mdb/usr/src/cmd/mdb/common/modules/hook/hook.c
===================================================================
--- mdb.orig/usr/src/cmd/mdb/common/modules/hook/hook.c 2014-03-01 16:18:00.000000000 +0400
+++ mdb/usr/src/cmd/mdb/common/modules/hook/hook.c 2014-05-03 12:23:40.726662045 +0400
@@ -215,7 +215,7 @@
{
hook_family_int_t hf;
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
mdb_warn("global walk not supported\n");
return (WALK_ERR);
}
@@ -241,7 +241,7 @@
return (DCMD_ERR);
}
wsp->walk_addr = (uintptr_t)SLIST_NEXT(&hr, hei_entry);
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_DONE);
return (wsp->walk_callback(wsp->walk_addr, wsp->walk_data,
wsp->walk_cbdata));

112
mdb/debian/patches/mdb-idm-NULL.patch Normal file
View File

@ -0,0 +1,112 @@
Index: mdb/usr/src/cmd/mdb/common/modules/idm/idm.c
===================================================================
--- mdb.orig/usr/src/cmd/mdb/common/modules/idm/idm.c 2014-03-01 16:18:00.000000000 +0400
+++ mdb/usr/src/cmd/mdb/common/modules/idm/idm.c 2014-05-03 12:28:02.166837337 +0400
@@ -667,7 +667,7 @@
if (!(flags & DCMD_ADDRSPEC)) {
if (mdb_pwalk("iscsi_ini_hba", iscsi_ini_hba_walk_cb,
- &idc, NULL) == -1) {
+ &idc, 0) == -1) {
mdb_warn("iscsi cmd hba list walk failed");
return (DCMD_ERR);
}
@@ -795,7 +795,7 @@
/* Always print hba info on this path */
idc->u.child.idc_hba = 1;
if (mdb_pwalk("iscsi_ini_hba", iscsi_ini_hba_walk_cb,
- idc, NULL) == -1) {
+ idc, 0) == -1) {
mdb_warn("iscsi cmd hba list walk failed");
return (DCMD_ERR);
}
@@ -1908,7 +1908,7 @@
return (DCMD_ERR);
}
- if (task_addr == NULL) {
+ if (task_addr == 0) {
task_ptr += sizeof (uintptr_t);
task_idx++;
continue;
@@ -3225,7 +3225,7 @@
iscsi_ini_sess_walk_init(mdb_walk_state_t *wsp) {
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
mdb_warn("<iscsi_sess_t addr>::walk iscsi_ini_sess");
return (WALK_ERR);
}
@@ -3243,7 +3243,7 @@
iscsi_ini_sess_step(mdb_walk_state_t *wsp) {
int status;
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
return (WALK_DONE);
}
@@ -3265,7 +3265,7 @@
static int
iscsi_ini_conn_walk_init(mdb_walk_state_t *wsp) {
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
mdb_warn("<iscsi_conn_t addr>::walk iscsi_ini_conn");
return (WALK_DONE);
}
@@ -3283,7 +3283,7 @@
iscsi_ini_conn_step(mdb_walk_state_t *wsp) {
int status;
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
return (WALK_DONE);
}
@@ -3306,7 +3306,7 @@
static int
iscsi_ini_lun_walk_init(mdb_walk_state_t *wsp) {
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
mdb_warn("<iscsi_lun_t addr>::walk iscsi_ini_lun");
return (WALK_DONE);
}
@@ -3323,7 +3323,7 @@
iscsi_ini_lun_step(mdb_walk_state_t *wsp) {
int status;
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
return (WALK_DONE);
}
@@ -3345,7 +3345,7 @@
static int
iscsi_ini_cmd_walk_init(mdb_walk_state_t *wsp) {
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
mdb_warn("<iscsi_cmd_t addr>::walk iscsi_ini_cmd");
return (WALK_DONE);
}
@@ -3362,7 +3362,7 @@
iscsi_ini_cmd_step(mdb_walk_state_t *wsp) {
int status;
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
return (WALK_DONE);
}
@@ -3415,7 +3415,7 @@
return (WALK_ERR);
}
- if (wsp->walk_addr != NULL) {
+ if (wsp->walk_addr != 0) {
mdb_warn("iscsi_ini_hba only supports global walk");
return (WALK_ERR);
} else {

253
mdb/debian/patches/mdb-ip-NULL.patch Normal file
View File

@ -0,0 +1,253 @@
Index: mdb/usr/src/cmd/mdb/common/modules/ip/ip.c
===================================================================
--- mdb.orig/usr/src/cmd/mdb/common/modules/ip/ip.c 2014-05-02 22:11:29.223145329 +0400
+++ mdb/usr/src/cmd/mdb/common/modules/ip/ip.c 2014-05-03 15:44:58.981919649 +0400
@@ -418,7 +418,7 @@
{
tcp_stack_t tcps;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_ERR);
if (mdb_vread(&tcps, sizeof (tcps), wsp->walk_addr) == -1) {
@@ -476,7 +476,7 @@
GElf_Sym sym;
list_node_t *next;
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
if (mdb_lookup_by_obj("ip", "ip_thread_list", &sym) == 0) {
wsp->walk_addr = sym.st_value;
} else {
@@ -516,7 +516,7 @@
{
illif_walk_data_t *iw;
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
mdb_warn("illif_stack supports only local walks\n");
return (WALK_ERR);
}
@@ -862,7 +862,7 @@
int status;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_DONE);
if (mdb_vread(&ire, sizeof (ire), wsp->walk_addr) == -1) {
@@ -1686,7 +1686,7 @@
(uintptr_t)q->q_ptr) == sizeof (ill))
return ((uintptr_t)ill.ill_rq);
- return (NULL);
+ return (0);
}
uintptr_t
@@ -1699,7 +1699,7 @@
(uintptr_t)q->q_ptr) == sizeof (ill))
return ((uintptr_t)ill.ill_wq);
- return (NULL);
+ return (0);
}
/*
@@ -1871,7 +1871,7 @@
return (DCMD_ERR);
}
}
- if (mdb_pwalk("th_hash", th_hash_summary, &thw, NULL) == -1) {
+ if (mdb_pwalk("th_hash", th_hash_summary, &thw, 0) == -1) {
mdb_warn("can't walk th_hash entries");
return (DCMD_ERR);
}
@@ -2242,7 +2242,7 @@
uintptr_t addr = start;
int i = *index;
- while (addr == NULL) {
+ while (addr == 0) {
if (++i >= NCE_TABLE_SIZE)
break;
@@ -2287,21 +2287,21 @@
ipcl_hash_get_next_connf_tbl(ipcl_hash_walk_data_t *iw)
{
struct connf_s connf;
- uintptr_t addr = NULL, next;
+ uintptr_t addr = 0, next;
int index = iw->connf_tbl_index;
do {
next = iw->hash_tbl + index * sizeof (struct connf_s);
if (++index >= iw->hash_tbl_size) {
- addr = NULL;
+ addr = 0;
break;
}
if (mdb_vread(&connf, sizeof (struct connf_s), next) == -1) {
mdb_warn("failed to read conn_t at %p", next);
- return (NULL);
+ return (0);
}
addr = (uintptr_t)connf.connf_head;
- } while (addr == NULL);
+ } while (addr == 0);
iw->connf_tbl_index = index;
return (addr);
}
@@ -2342,7 +2342,7 @@
wsp->walk_addr = ipcl_hash_get_next_connf_tbl(iw);
wsp->walk_data = iw;
- if (wsp->walk_addr != NULL)
+ if (wsp->walk_addr != 0)
return (WALK_NEXT);
else
return (WALK_DONE);
@@ -2356,7 +2356,7 @@
conn_t *conn = iw->conn;
int ret = WALK_DONE;
- while (addr != NULL) {
+ while (addr != 0) {
if (mdb_vread(conn, sizeof (conn_t), addr) == -1) {
mdb_warn("failed to read conn_t at %p", addr);
return (WALK_ERR);
@@ -2369,7 +2369,7 @@
if (ret == WALK_NEXT) {
wsp->walk_addr = ipcl_hash_get_next_connf_tbl(iw);
- if (wsp->walk_addr != NULL)
+ if (wsp->walk_addr != 0)
return (WALK_NEXT);
else
return (WALK_DONE);
@@ -2395,7 +2395,7 @@
{
ncec_walk_data_t *nw;
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
mdb_warn("ncec_stack requires ndp_g_s address\n");
return (WALK_ERR);
}
@@ -2414,7 +2414,7 @@
* ncec_get_next_hash_tbl() starts at ++i , so initialize index to -1
*/
nw->ncec_hash_tbl_index = -1;
- wsp->walk_addr = ncec_get_next_hash_tbl(NULL,
+ wsp->walk_addr = ncec_get_next_hash_tbl(0,
&nw->ncec_hash_tbl_index, nw->ncec_ip_ndp);
wsp->walk_data = nw;
@@ -2427,7 +2427,7 @@
uintptr_t addr = wsp->walk_addr;
ncec_walk_data_t *nw = wsp->walk_data;
- if (addr == NULL)
+ if (addr == 0)
return (WALK_DONE);
if (mdb_vread(&nw->ncec, sizeof (ncec_t), addr) == -1) {
@@ -2712,7 +2712,7 @@
ip_list_walk_data_t *iw;
uintptr_t addr = (uintptr_t)(wsp->walk_addr + arg->off);
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
mdb_warn("only local walks supported\n");
return (WALK_ERR);
}
@@ -2734,7 +2734,7 @@
ip_list_walk_data_t *iw = wsp->walk_data;
uintptr_t addr = wsp->walk_addr;
- if (addr == NULL)
+ if (addr == 0)
return (WALK_DONE);
wsp->walk_addr = addr + iw->nextoff;
if (mdb_vread(&wsp->walk_addr, sizeof (uintptr_t),
@@ -3178,14 +3178,14 @@
{
ilb_stack_t ilbs;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_ERR);
if (mdb_vread(&ilbs, sizeof (ilbs), wsp->walk_addr) == -1) {
mdb_warn("failed to read ilb_stack_t at %p", wsp->walk_addr);
return (WALK_ERR);
}
- if ((wsp->walk_addr = (uintptr_t)ilbs.ilbs_rule_head) != NULL)
+ if ((wsp->walk_addr = (uintptr_t)ilbs.ilbs_rule_head) != 0)
return (WALK_NEXT);
else
return (WALK_DONE);
@@ -3204,7 +3204,7 @@
status = wsp->walk_callback(wsp->walk_addr, &rule, wsp->walk_cbdata);
if (status != WALK_NEXT)
return (status);
- if ((wsp->walk_addr = (uintptr_t)rule.ir_next) == NULL)
+ if ((wsp->walk_addr = (uintptr_t)rule.ir_next) == 0)
return (WALK_DONE);
else
return (WALK_NEXT);
@@ -3215,14 +3215,14 @@
{
ilb_rule_t rule;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_ERR);
if (mdb_vread(&rule, sizeof (rule), wsp->walk_addr) == -1) {
mdb_warn("failed to read ilb_rule_t at %p", wsp->walk_addr);
return (WALK_ERR);
}
- if ((wsp->walk_addr = (uintptr_t)rule.ir_servers) != NULL)
+ if ((wsp->walk_addr = (uintptr_t)rule.ir_servers) != 0)
return (WALK_NEXT);
else
return (WALK_DONE);
@@ -3241,7 +3241,7 @@
status = wsp->walk_callback(wsp->walk_addr, &server, wsp->walk_cbdata);
if (status != WALK_NEXT)
return (status);
- if ((wsp->walk_addr = (uintptr_t)server.iser_next) == NULL)
+ if ((wsp->walk_addr = (uintptr_t)server.iser_next) == 0)
return (WALK_DONE);
else
return (WALK_NEXT);
@@ -3266,7 +3266,7 @@
ilb_walk_t *ns_walk;
ilb_nat_src_entry_t *entry = NULL;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_ERR);
ns_walk = mdb_alloc(sizeof (ilb_walk_t), UM_SLEEP);
@@ -3405,7 +3405,7 @@
ilb_walk_t *conn_walk;
ilb_conn_hash_t head;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_ERR);
conn_walk = mdb_alloc(sizeof (ilb_walk_t), UM_SLEEP);
@@ -3507,7 +3507,7 @@
ilb_walk_t *sticky_walk;
ilb_sticky_t *st = NULL;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_ERR);
sticky_walk = mdb_alloc(sizeof (ilb_walk_t), UM_SLEEP);

13
mdb/debian/patches/mdb-ipc-NULL.patch Normal file
View File

@ -0,0 +1,13 @@
Index: mdb/usr/src/cmd/mdb/common/modules/ipc/ipc.c
===================================================================
--- mdb.orig/usr/src/cmd/mdb/common/modules/ipc/ipc.c 2014-03-01 16:18:00.000000000 +0400
+++ mdb/usr/src/cmd/mdb/common/modules/ipc/ipc.c 2014-05-03 15:46:50.675459874 +0400
@@ -355,7 +355,7 @@
{
ipc_ops_vec_t *iv = wsp->walk_arg;
- if (wsp->walk_arg != NULL && wsp->walk_addr != NULL)
+ if (wsp->walk_arg != NULL && wsp->walk_addr != 0)
mdb_printf("ignoring provided address\n");
if (wsp->walk_arg)

22
mdb/debian/patches/mdb-ipp-NULL.patch Normal file
View File

@ -0,0 +1,22 @@
Index: mdb/usr/src/cmd/mdb/common/modules/ipp/ipp.c
===================================================================
--- mdb.orig/usr/src/cmd/mdb/common/modules/ipp/ipp.c 2014-03-01 16:18:00.000000000 +0400
+++ mdb/usr/src/cmd/mdb/common/modules/ipp/ipp.c 2014-05-03 15:48:27.749723477 +0400
@@ -495,7 +495,7 @@
ref_walk_init(
mdb_walk_state_t *wsp)
{
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_DONE);
return (WALK_NEXT);
@@ -508,7 +508,7 @@
ipp_ref_t *rp;
int status;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_DONE);
rp = mdb_alloc(sizeof (ipp_ref_t), UM_SLEEP);

25
mdb/debian/patches/mdb-krtld-NULL.patch Normal file
View File

@ -0,0 +1,25 @@
Index: mdb/usr/src/cmd/mdb/common/modules/krtld/krtld.c
===================================================================
--- mdb.orig/usr/src/cmd/mdb/common/modules/krtld/krtld.c 2014-03-01 16:18:00.000000000 +0400
+++ mdb/usr/src/cmd/mdb/common/modules/krtld/krtld.c 2014-05-03 15:50:18.774950261 +0400
@@ -45,9 +45,9 @@
struct modctl_walk_data *mwd = mdb_alloc(
sizeof (struct modctl_walk_data), UM_SLEEP);
- mwd->mwd_head = (wsp->walk_addr == NULL ? module_head : wsp->walk_addr);
+ mwd->mwd_head = (wsp->walk_addr == 0 ? module_head : wsp->walk_addr);
wsp->walk_data = mwd;
- wsp->walk_addr = NULL;
+ wsp->walk_addr = 0;
return (WALK_NEXT);
}
@@ -61,7 +61,7 @@
if (wsp->walk_addr == mwd->mwd_head)
return (WALK_DONE);
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
wsp->walk_addr = mwd->mwd_head;
if (mdb_vread(&mwd->mwd_modctl, sizeof (struct modctl),

22
mdb/debian/patches/mdb-lofs-NULL.patch Normal file
View File

@ -0,0 +1,22 @@
Index: mdb/usr/src/cmd/mdb/common/modules/lofs/lofs.c
===================================================================
--- mdb.orig/usr/src/cmd/mdb/common/modules/lofs/lofs.c 2014-03-01 16:18:00.000000000 +0400
+++ mdb/usr/src/cmd/mdb/common/modules/lofs/lofs.c 2014-05-03 15:57:25.522302251 +0400
@@ -54,7 +54,7 @@
return (WALK_ERR);
}
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
uintptr_t rootvfsp, vfsp;
uint_t htsize;
@@ -159,7 +159,7 @@
* If the next lnode_t address we want is NULL, advance to the next
* hash bucket. When we reach lw_tabsz, we're done.
*/
- while (wsp->walk_addr == NULL) {
+ while (wsp->walk_addr == 0) {
if (++lwp->lw_tabi < lwp->lw_tabsz)
wsp->walk_addr =
(uintptr_t)lwp->lw_table[lwp->lw_tabi].lh_chain;

13
mdb/debian/patches/mdb-mac-NULL.patch Normal file
View File

@ -0,0 +1,13 @@
Index: mdb/usr/src/cmd/mdb/common/modules/mac/mac.c
===================================================================
--- mdb.orig/usr/src/cmd/mdb/common/modules/mac/mac.c 2014-03-01 16:18:00.000000000 +0400
+++ mdb/usr/src/cmd/mdb/common/modules/mac/mac.c 2014-05-03 15:59:08.469444412 +0400
@@ -444,7 +444,7 @@
{
int status;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_DONE);
status = wsp->walk_callback(wsp->walk_addr, wsp->walk_data,

295
mdb/debian/patches/mdb-md-NULL.patch Normal file
View File

@ -0,0 +1,295 @@
Index: mdb/usr/src/cmd/mdb/common/modules/md/dumpnamespace.c
===================================================================
--- mdb.orig/usr/src/cmd/mdb/common/modules/md/dumpnamespace.c 2014-03-01 16:18:00.000000000 +0400
+++ mdb/usr/src/cmd/mdb/common/modules/md/dumpnamespace.c 2014-05-03 16:09:26.131551286 +0400
@@ -56,10 +56,10 @@
if (mdb_vread(&shn, sizeof (struct did_shr_name), addr) !=
sizeof (struct did_shr_name)) {
mdb_warn("failed to read did_shr_name at %p\n", addr);
- return (NULL);
+ return (0);
}
if (shn.did_size == 0)
- return (NULL);
+ return (0);
mdb_printf("device_id[%d] at %p\n", i, addr);
mdb_inc_indent(2);
mdb_printf("did_key: %d\n", shn.did_key);
@@ -73,7 +73,7 @@
sn_name_addr) <= 0) {
mdb_warn("failed to read sn_name at %p\n",
sn_name_addr);
- return (NULL);
+ return (0);
}
mdb_printf("did_devid: %s at %p\n", (char *)sn_name,
sn_name_addr);
@@ -94,10 +94,10 @@
if (mdb_vread(&shn, sizeof (struct nm_shared_name), addr) !=
sizeof (struct nm_shared_name)) {
mdb_warn("failed to read nm_shared_name at %p\n", addr);
- return (NULL);
+ return (0);
}
if (shn.sn_namlen == 0)
- return (NULL);
+ return (0);
mdb_printf("sr_name[%d] at %p\n", i, addr);
mdb_inc_indent(2);
mdb_printf("sn_key: %d \n", shn.sn_key);
@@ -131,10 +131,10 @@
if (mdb_vread(&didmn, sizeof (struct did_min_name), addr) !=
sizeof (struct did_min_name)) {
mdb_warn("failed to read did_min_name at %p\n", addr);
- return (NULL);
+ return (0);
}
if (didmn.min_namlen == 0)
- return (NULL);
+ return (0);
mdb_printf("minor_name[%d] at %p\n", i, addr);
mdb_inc_indent(2);
mdb_printf("min_key: %d \n", didmn.min_key);
@@ -168,10 +168,10 @@
if (mdb_vread(&nm, sizeof (struct nm_name), addr) !=
sizeof (struct nm_name)) {
mdb_warn("failed to read nm_name at %p\n", addr);
- return (NULL);
+ return (0);
}
if (nm.n_namlen == 0)
- return (NULL);
+ return (0);
mdb_printf("r_name[%d] at %p\n", i, addr);
mdb_inc_indent(2);
mdb_printf("n_key: %d \n", nm.n_key);
@@ -282,7 +282,7 @@
for (i = 0; ; i++) {
shn_addr = next_addr;
next_addr = print_did_shared_name(shn_addr, i);
- if (next_addr == NULL) {
+ if (next_addr == 0) {
mdb_dec_indent(2);
return;
}
@@ -305,7 +305,7 @@
for (i = 0; ; i++) {
shn_addr = next_addr;
next_addr = print_devid_name(shn_addr, i);
- if (next_addr == NULL) {
+ if (next_addr == 0) {
mdb_dec_indent(2);
return;
}
@@ -326,7 +326,7 @@
for (i = 0; ; i++) {
shn_addr = next_addr;
next_addr = print_nm_shared_name(shn_addr, i);
- if (next_addr == NULL) {
+ if (next_addr == 0) {
mdb_dec_indent(2);
return;
}
@@ -348,7 +348,7 @@
for (i = 0; ; i++) {
shn_addr = next_addr;
next_addr = print_nm_name(shn_addr, i);
- if (next_addr == NULL) {
+ if (next_addr == 0) {
mdb_dec_indent(2);
return;
}
@@ -412,7 +412,7 @@
return;
}
mdb_printf("hh_header: %p \n", hdr.hh_header);
- if (did_addr != NULL) { /* device id's exist */
+ if (did_addr != 0) { /* device id's exist */
if (mdb_vread(&did_hdr, sizeof (struct nm_header_hdr),
did_addr) != sizeof (struct nm_header_hdr)) {
mdb_warn("failed to read nm_header_hdr at %p\n",
@@ -431,7 +431,7 @@
mdb_printf("hh_names: %p \n", names_addr);
mdb_printf("hh_shared: %p\n", shared_addr);
- if (did_addr != NULL) {
+ if (did_addr != 0) {
mdb_printf("did hh_names: %p \n", did_names_addr);
mdb_printf("did hh_shared: %p\n", did_shared_addr);
}
@@ -441,7 +441,7 @@
mdb_printf("\nhh_shared:");
process_nm_next_hdr(shared_addr, 1, 0);
- if (did_addr != NULL) {
+ if (did_addr != 0) {
mdb_printf("did hh_names:");
process_nm_next_hdr(did_names_addr, 0, 1);
mdb_printf("\ndid hh_shared:");
Index: mdb/usr/src/cmd/mdb/common/modules/md/metaset.c
===================================================================
--- mdb.orig/usr/src/cmd/mdb/common/modules/md/metaset.c 2014-03-01 16:18:00.000000000 +0400
+++ mdb/usr/src/cmd/mdb/common/modules/md/metaset.c 2014-05-03 16:09:26.141265932 +0400
@@ -37,7 +37,7 @@
char machine[1024];
if (mdb_vread(&set_db, sizeof (mddb_set_t), addr) == -1) {
- if (addr != NULL) {
+ if (addr != 0) {
mdb_warn("failed to read mddb_set_t at 0x%p\n", addr);
return (DCMD_ERR);
} else {
Index: mdb/usr/src/cmd/mdb/common/modules/md/metastat.c
===================================================================
--- mdb.orig/usr/src/cmd/mdb/common/modules/md/metastat.c 2014-03-01 16:18:00.000000000 +0400
+++ mdb/usr/src/cmd/mdb/common/modules/md/metastat.c 2014-05-03 16:09:26.162053518 +0400
@@ -97,7 +97,7 @@
mdb_warn("failed to read submirror at %p\n", addr);
return (WALK_ERR);
}
- if (un_addr != NULL) {
+ if (un_addr != 0) {
if (mdb_vread(&mdc_sm, sizeof (mdc_unit_t), un_addr) == -1) {
mdb_warn("failed to read mdc_unit_t at %p", un_addr);
return (WALK_ERR);
@@ -479,7 +479,7 @@
return (DCMD_ERR);
}
- if (un_addr != NULL) {
+ if (un_addr != 0) {
if (mdb_vread(&mdc, sizeof (mdc_unit_t), un_addr) == -1) {
mdb_warn("failed to read mdc_unit_t at %p", un_addr);
return (DCMD_ERR);
Index: mdb/usr/src/cmd/mdb/common/modules/md/walk_hsp.c
===================================================================
--- mdb.orig/usr/src/cmd/mdb/common/modules/md/walk_hsp.c 2014-03-01 16:18:00.000000000 +0400
+++ mdb/usr/src/cmd/mdb/common/modules/md/walk_hsp.c 2014-05-03 16:09:26.205064186 +0400
@@ -53,12 +53,12 @@
int status;
hot_spare_pool_t hsp;
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
*((int *)wsp->walk_data) += 1;
if (*((int *)wsp->walk_data) < md_nsets) {
wsp->walk_addr =
(uintptr_t)mdset[*((int *)wsp->walk_data)].s_hsp;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_NEXT);
mdb_printf("Hotspare Pools for set number %d\n",
*((int *)wsp->walk_data));
Index: mdb/usr/src/cmd/mdb/common/modules/md/walk_units.c
===================================================================
--- mdb.orig/usr/src/cmd/mdb/common/modules/md/walk_units.c 2014-03-01 16:18:00.000000000 +0400
+++ mdb/usr/src/cmd/mdb/common/modules/md/walk_units.c 2014-05-03 16:09:26.211471886 +0400
@@ -54,7 +54,7 @@
* do_all: print all the sets on the system or not.
*/
((unit_data_t *)wsp->walk_data)->nunits = 0;
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
/* if no address is specified, walk all units of all sets */
mdb_printf("Units for set number 0\n");
addr = (uintptr_t)mdset[0].s_un;
@@ -87,7 +87,7 @@
if ((un->setno < md_nsets) && (un->do_all == 1)) {
un->nunits = 0;
wsp->walk_addr = (uintptr_t)mdset[un->setno].s_un;
- if (wsp->walk_addr != NULL)
+ if (wsp->walk_addr != 0)
mdb_printf("Units for set number %d\n",
un->setno);
} else {
@@ -95,7 +95,7 @@
}
}
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
un->nunits = md_nunits;
return (WALK_NEXT);
}
Index: mdb/usr/src/cmd/mdb/common/modules/md/walk_didnm.c
===================================================================
--- mdb.orig/usr/src/cmd/mdb/common/modules/md/walk_didnm.c 2014-03-01 16:18:00.000000000 +0400
+++ mdb/usr/src/cmd/mdb/common/modules/md/walk_didnm.c 2014-05-03 16:09:26.189882081 +0400
@@ -52,12 +52,12 @@
int status;
struct nm_header_hdr hdr;
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
if (*((int *)wsp->walk_data) < md_nsets) {
*((int *)wsp->walk_data) += 1;
wsp->walk_addr =
(uintptr_t)mdset[*((int *)wsp->walk_data)].s_did_nm;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_NEXT);
} else {
return (WALK_DONE);
Index: mdb/usr/src/cmd/mdb/common/modules/md/walk_nm.c
===================================================================
--- mdb.orig/usr/src/cmd/mdb/common/modules/md/walk_nm.c 2014-03-01 16:18:00.000000000 +0400
+++ mdb/usr/src/cmd/mdb/common/modules/md/walk_nm.c 2014-05-03 16:09:26.208136583 +0400
@@ -52,12 +52,12 @@
int status;
struct nm_header_hdr hdr;
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
if (*((int *)wsp->walk_data) < md_nsets) {
*((int *)wsp->walk_data) += 1;
wsp->walk_addr =
(uintptr_t)mdset[*((int *)wsp->walk_data)].s_nm;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_NEXT);
} else {
return (WALK_DONE);
Index: mdb/usr/src/cmd/mdb/common/modules/md/walk_directory_block.c
===================================================================
--- mdb.orig/usr/src/cmd/mdb/common/modules/md/walk_directory_block.c 2014-03-01 16:18:00.000000000 +0400
+++ mdb/usr/src/cmd/mdb/common/modules/md/walk_directory_block.c 2014-05-03 16:09:26.199031505 +0400
@@ -36,7 +36,7 @@
{
/* Must have a start addr. */
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
mdb_warn("start address required\n");
return (WALK_ERR);
}
@@ -53,7 +53,7 @@
mddb_db_t db_entry;
int status;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_DONE);
if (mdb_vread(&db_entry, sizeof (mddb_db_t), wsp->walk_addr) == -1) {
Index: mdb/usr/src/cmd/mdb/common/modules/md/walk_directory_entry.c
===================================================================
--- mdb.orig/usr/src/cmd/mdb/common/modules/md/walk_directory_entry.c 2014-03-01 16:18:00.000000000 +0400
+++ mdb/usr/src/cmd/mdb/common/modules/md/walk_directory_entry.c 2014-05-03 16:09:26.201859850 +0400
@@ -36,7 +36,7 @@
{
/* Must have a start addr. */
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
mdb_warn("start address required\n");
return (WALK_ERR);
}
@@ -54,7 +54,7 @@
int status;
/* Check if we're at the last element */
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_DONE);
if (mdb_vread(&de_entry, sizeof (mddb_de_ic_t), wsp->walk_addr) == -1) {

94
mdb/debian/patches/mdb-mdb_ds-NULL.patch Normal file
View File

@ -0,0 +1,94 @@
Index: mdb/usr/src/cmd/mdb/common/modules/mdb_ds/mdb_ds.c
===================================================================
--- mdb.orig/usr/src/cmd/mdb/common/modules/mdb_ds/mdb_ds.c 2014-03-01 16:18:00.000000000 +0400
+++ mdb/usr/src/cmd/mdb/common/modules/mdb_ds/mdb_ds.c 2014-05-03 12:07:59.034763480 +0400
@@ -383,7 +383,7 @@
dpth.dpth_path++;
- if (pathp == NULL)
+ if (pathp == 0)
break;
if (mdb_readstr(path, sizeof (path), pathp) < 0) {
@@ -427,7 +427,7 @@
uintptr_t addr = wsp->walk_addr;
mdb_iob_t iob;
- if (addr == NULL)
+ if (addr == 0)
return (WALK_DONE);
if (mdb_vread(&iob, sizeof (iob), addr) == -1) {
@@ -442,7 +442,7 @@
static int
frame_walk_init(mdb_walk_state_t *wsp)
{
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
wsp->walk_addr = (uintptr_t)get_mdb()->m_flist.ml_prev;
return (WALK_NEXT);
@@ -454,7 +454,7 @@
uintptr_t addr = wsp->walk_addr;
mdb_frame_t f;
- if (addr == NULL)
+ if (addr == 0)
return (WALK_DONE);
if (mdb_vread(&f, sizeof (f), addr) == -1) {
@@ -469,7 +469,7 @@
static int
target_walk_init(mdb_walk_state_t *wsp)
{
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
wsp->walk_addr = (uintptr_t)get_mdb()->m_target;
return (WALK_NEXT);
@@ -481,7 +481,7 @@
uintptr_t addr = wsp->walk_addr;
mdb_tgt_t t;
- if (addr == NULL)
+ if (addr == 0)
return (WALK_DONE);
if (mdb_vread(&t, sizeof (t), addr) == -1) {
@@ -499,7 +499,7 @@
uintptr_t addr = wsp->walk_addr;
mdb_sespec_t s;
- if (addr == NULL)
+ if (addr == 0)
return (WALK_DONE);
if (mdb_vread(&s, sizeof (s), addr) == -1) {
@@ -517,7 +517,7 @@
uintptr_t addr = wsp->walk_addr;
mdb_vespec_t v;
- if (addr == NULL)
+ if (addr == 0)
return (WALK_DONE);
if (mdb_vread(&v, sizeof (v), addr) == -1) {
@@ -535,7 +535,7 @@
uintptr_t addr = wsp->walk_addr;
mdb_sespec_t s;
- if (addr == NULL)
+ if (addr == 0)
return (WALK_DONE);
if (mdb_vread(&s, sizeof (s), addr) == -1) {
@@ -597,7 +597,7 @@
"implementation (mdb_t mismatch)\n");
}
- if (mdb_readvar(&addr, "_mdb_abort_str") != -1 && addr != NULL &&
+ if (mdb_readvar(&addr, "_mdb_abort_str") != -1 && addr != 0 &&
mdb_readstr(buf, sizeof (buf), addr) > 0)
mdb_printf("mdb: debugger failed with error: %s\n", buf);

40
mdb/debian/patches/mdb-mpt_sas-NULL.patch Normal file
View File

@ -0,0 +1,40 @@
Index: mdb/usr/src/cmd/mdb/common/modules/mpt_sas/mpt_sas.c
===================================================================
--- mdb.orig/usr/src/cmd/mdb/common/modules/mpt_sas/mpt_sas.c 2014-03-01 16:18:00.000000000 +0400
+++ mdb/usr/src/cmd/mdb/common/modules/mpt_sas/mpt_sas.c 2014-05-03 16:11:18.595562184 +0400
@@ -118,7 +118,7 @@
return (-1);
}
- *dev_path = NULL;
+ *dev_path = 0;
if (construct_path((uintptr_t)c.ct_dip, dev_path) != DCMD_OK)
strcpy(dev_path, "unknown");
@@ -226,7 +226,7 @@
{
if ((uintptr_t)lp->list_head.list_next ==
klp + offsetof(struct list, list_head))
- return (NULL);
+ return (0);
return ((uintptr_t)(((char *)lp->list_head.list_next) -
lp->list_offset));
@@ -240,7 +240,7 @@
lp->list_offset);
if ((uintptr_t)np->list_next == klp + offsetof(struct list, list_head))
- return (NULL);
+ return (0);
return (((uintptr_t)(np->list_next)) - lp->list_offset);
}
@@ -281,7 +281,7 @@
lp = (refhash_link_t *)(((char *)(op)) + mh.rh_link_off);
ml = *lp;
while ((klp = klist_next(&mh.rh_objs,
- khp + offsetof(refhash_t, rh_objs), &ml)) != NULL) {
+ khp + offsetof(refhash_t, rh_objs), &ml)) != 0) {
mdb_vread(&ml, sizeof (ml), klp);
if (!(ml.rhl_flags & RHL_F_DEAD))
break;

148
mdb/debian/patches/mdb-nsctl-NULL.patch Normal file
View File

@ -0,0 +1,148 @@
Index: mdb/usr/src/cmd/mdb/common/modules/nsctl/nsctl.c
===================================================================
--- mdb.orig/usr/src/cmd/mdb/common/modules/nsctl/nsctl.c 2014-03-01 16:18:00.000000000 +0400
+++ mdb/usr/src/cmd/mdb/common/modules/nsctl/nsctl.c 2014-05-03 16:14:37.851604222 +0400
@@ -176,7 +176,7 @@
static int
nsc_io_winit(mdb_walk_state_t *wsp)
{
- if (wsp->walk_addr == NULL &&
+ if (wsp->walk_addr == 0 &&
mdb_readvar(&wsp->walk_addr, "_nsc_io_top") == -1) {
mdb_warn("unable to read '_nsc_io_top'");
return (WALK_ERR);
@@ -192,7 +192,7 @@
uintptr_t next;
int status;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_DONE);
status = wsp->walk_callback(wsp->walk_addr, wsp->walk_data,
@@ -219,7 +219,7 @@
static int
nsc_dev_winit(mdb_walk_state_t *wsp)
{
- if (wsp->walk_addr == NULL &&
+ if (wsp->walk_addr == 0 &&
mdb_readvar(&wsp->walk_addr, "_nsc_dev_top") == -1) {
mdb_warn("unable to read '_nsc_dev_top'");
return (WALK_ERR);
@@ -235,7 +235,7 @@
uintptr_t next;
int status;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_DONE);
status = wsp->walk_callback(wsp->walk_addr, wsp->walk_data,
@@ -271,7 +271,7 @@
static int
nsc_devval_winit(mdb_walk_state_t *wsp)
{
- if (wsp->walk_addr == NULL &&
+ if (wsp->walk_addr == 0 &&
mdb_readvar(&wsp->walk_addr, "_nsc_devval_top") == -1) {
mdb_warn("unable to read '_nsc_devval_top'");
return (WALK_ERR);
@@ -315,7 +315,7 @@
static int
nsc_fd_winit(mdb_walk_state_t *wsp)
{
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
mdb_warn("nsc_fd doesn't support global walks");
return (WALK_ERR);
}
@@ -358,7 +358,7 @@
static int
nsc_iodev_winit(mdb_walk_state_t *wsp)
{
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
mdb_warn("nsc_iodev doesn't support global walks");
return (WALK_ERR);
}
@@ -399,7 +399,7 @@
static int
nsc_service_winit(mdb_walk_state_t *wsp)
{
- if (wsp->walk_addr == NULL &&
+ if (wsp->walk_addr == 0 &&
mdb_readvar(&wsp->walk_addr, "_nsc_services") == -1) {
mdb_warn("unable to read '_nsc_services'");
return (WALK_ERR);
@@ -443,7 +443,7 @@
static int
nsc_svc_winit(mdb_walk_state_t *wsp)
{
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
mdb_warn("nsc_svc does not support global walks");
return (WALK_ERR);
}
@@ -486,7 +486,7 @@
static int
nsc_val_winit(mdb_walk_state_t *wsp)
{
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
mdb_warn("nsc_val doesn't support global walks");
return (WALK_ERR);
}
@@ -529,7 +529,7 @@
static int
nstset_winit(mdb_walk_state_t *wsp)
{
- if (wsp->walk_addr == NULL &&
+ if (wsp->walk_addr == 0 &&
mdb_readvar(&wsp->walk_addr, "nst_sets") == -1) {
mdb_warn("unable to read 'nst_sets'");
return (WALK_ERR);
@@ -573,7 +573,7 @@
static int
nsthread_winit(mdb_walk_state_t *wsp)
{
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
mdb_warn("nsthread does not support global walks");
return (WALK_ERR);
}
@@ -616,7 +616,7 @@
static int
nst_free_winit(mdb_walk_state_t *wsp)
{
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
mdb_warn("nst_free does not support global walks");
return (WALK_ERR);
}
@@ -674,7 +674,7 @@
static int
nsc_mem_winit(mdb_walk_state_t *wsp)
{
- if (wsp->walk_addr == NULL &&
+ if (wsp->walk_addr == 0 &&
mdb_readvar(&wsp->walk_addr, "_nsc_mem_top") == -1) {
mdb_warn("unable to read '_nsc_mem_top'");
return (WALK_ERR);
@@ -1232,7 +1232,7 @@
/* walk iodev chains */
- if (iodev != NULL) {
+ if (iodev != 0) {
if (mdb_pwalk_dcmd("nsctl`nsc_iodev", "nsctl`nsc_iodev",
iodevall->argc, iodevall->argv, iodev) == -1)
return (WALK_ERR);
@@ -1662,7 +1662,7 @@
/* walk thread chains */
- if (tp != NULL) {
+ if (tp != 0) {
if (mdb_pwalk_dcmd("nsctl`nsthread", "nsctl`nsthread",
thrall->argc, thrall->argv, tp) == -1)
return (WALK_ERR);

49
mdb/debian/patches/mdb-nsmb-NULL.patch Normal file
View File

@ -0,0 +1,49 @@
Index: mdb/usr/src/cmd/mdb/common/modules/nsmb/nsmb.c
===================================================================
--- mdb.orig/usr/src/cmd/mdb/common/modules/nsmb/nsmb.c 2014-03-01 16:18:00.000000000 +0400
+++ mdb/usr/src/cmd/mdb/common/modules/nsmb/nsmb.c 2014-05-03 16:17:21.987514525 +0400
@@ -85,7 +85,7 @@
smb_co_walk_data_t *smbw;
size_t psz;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_ERR);
smbw = mdb_alloc(sizeof (*smbw), UM_SLEEP | UM_GC);
@@ -140,7 +140,7 @@
{
GElf_Sym sym;
- if (wsp->walk_addr != NULL) {
+ if (wsp->walk_addr != 0) {
mdb_warn("::walk smb_vc only supports global walks\n");
return (WALK_ERR);
}
@@ -183,7 +183,7 @@
smb_co_walk_data_t *smbw = wsp->walk_data;
int status;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_DONE);
if (mdb_vread(&smbw->u, smbw->size, wsp->walk_addr)
@@ -390,7 +390,7 @@
smb_rq_t rq;
int status;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_DONE);
if (mdb_vread(&rq, sizeof (rq), wsp->walk_addr) == -1) {
@@ -466,7 +466,7 @@
{
GElf_Sym sym;
- if (wsp->walk_addr != NULL) {
+ if (wsp->walk_addr != 0) {
mdb_warn("pwtree walk only supports global walks\n");
return (WALK_ERR);
}

85
mdb/debian/patches/mdb-pmcs-NULL.patch Normal file
View File

@ -0,0 +1,85 @@
Index: mdb/usr/src/cmd/mdb/common/modules/pmcs/pmcs.c
===================================================================
--- mdb.orig/usr/src/cmd/mdb/common/modules/pmcs/pmcs.c 2014-03-01 16:18:00.000000000 +0400
+++ mdb/usr/src/cmd/mdb/common/modules/pmcs/pmcs.c 2014-05-03 16:19:49.327129628 +0400
@@ -228,7 +228,7 @@
mdb_vread(&dam1, sizeof (dam1),
(uintptr_t)(sizeof (dam0) + tmd_offset + (char *)sht.tran_tgtmap));
- if (dam0 != NULL) {
+ if (dam0 != 0) {
rval = mdb_call_dcmd("damap", dam0, DCMD_ADDRSPEC, 0, NULL);
mdb_printf("\n");
if (rval != DCMD_OK) {
@@ -236,7 +236,7 @@
}
}
- if (dam1 != NULL) {
+ if (dam1 != 0) {
rval = mdb_call_dcmd("damap", dam1, DCMD_ADDRSPEC, 0, NULL);
mdb_printf("\n");
}
@@ -1545,7 +1545,7 @@
/*
* If we have a PHY, read it in and get it's handle
*/
- if (_phy != NULL) {
+ if (_phy != 0) {
if (MDB_RD(phy, sizeof (*phy), _phy) == -1) {
NOREAD(pmcs_phy_t, phy);
} else {
@@ -1741,7 +1741,7 @@
for (qidx = 0; qidx < PMCS_NOQ; qidx++) {
obqp = (uintptr_t)ss.oqp[qidx];
- if (obqp == NULL) {
+ if (obqp == 0) {
mdb_printf("No outbound queue ptr for queue #%d\n",
qidx);
continue;
@@ -1873,7 +1873,7 @@
for (qidx = 0; qidx < PMCS_NIQ; qidx++) {
ibqp = (uintptr_t)ss.iqp[qidx];
- if (ibqp == NULL) {
+ if (ibqp == 0) {
mdb_printf("No inbound queue ptr for queue #%d\n",
qidx);
continue;
@@ -2367,7 +2367,7 @@
static int
targets_walk_i(mdb_walk_state_t *wsp)
{
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
mdb_warn("Can not perform global walk\n");
return (WALK_ERR);
}
@@ -2418,7 +2418,7 @@
do {
wsp->walk_addr = (uintptr_t)(targets[++target_idx]);
- } while ((wsp->walk_addr == NULL) && (target_idx < ss.max_dev));
+ } while ((wsp->walk_addr == 0) && (target_idx < ss.max_dev));
if (target_idx == ss.max_dev) {
return (WALK_DONE);
@@ -2478,7 +2478,7 @@
static int
phy_walk_i(mdb_walk_state_t *wsp)
{
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
mdb_warn("Can not perform global walk\n");
return (WALK_ERR);
}
@@ -2522,7 +2522,7 @@
wsp->walk_addr = (uintptr_t)(phyp->sibling);
}
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
/*
* We reached the end of this sibling list. Trudge back up
* to the parent and find the next sibling after the expander

40
mdb/debian/patches/mdb-ptm-NULL.patch Normal file
View File

@ -0,0 +1,40 @@
Index: mdb/usr/src/cmd/mdb/common/modules/ptm/ptm.c
===================================================================
--- mdb.orig/usr/src/cmd/mdb/common/modules/ptm/ptm.c 2014-03-01 16:18:00.000000000 +0400
+++ mdb/usr/src/cmd/mdb/common/modules/ptm/ptm.c 2014-05-03 16:21:13.227410750 +0400
@@ -142,7 +142,7 @@
}
if (pt.pt_pid != 0) {
- if (mdb_pid2proc(pt.pt_pid, &p) == NULL)
+ if (mdb_pid2proc(pt.pt_pid, &p) == 0)
(void) strcpy(c, "<defunct>");
else
(void) strcpy(c, p.p_user.u_comm);
@@ -184,7 +184,7 @@
(void) mdb_vread(&pt, sizeof (pt), (uintptr_t)q->q_ptr);
if (pt.pt_pid != 0) {
- if (mdb_pid2proc(pt.pt_pid, &p) == NULL)
+ if (mdb_pid2proc(pt.pt_pid, &p) == 0)
(void) strcpy(c, "<defunct>");
else
(void) strcpy(c, p.p_user.u_comm);
@@ -214,7 +214,7 @@
{
size_t nslots;
- if (wsp->walk_addr != NULL) {
+ if (wsp->walk_addr != 0) {
mdb_warn("ptms supports only global walks");
return (WALK_ERR);
}
@@ -254,7 +254,7 @@
return (WALK_DONE);
}
- if (ptr == NULL) {
+ if (ptr == 0) {
wsp->walk_addr += sizeof (uintptr_t);
return (WALK_NEXT);
}

213
mdb/debian/patches/mdb-qlc-NULL.patch Normal file
View File

@ -0,0 +1,213 @@
Index: mdb/usr/src/cmd/mdb/common/modules/qlc/qlc.c
===================================================================
--- mdb.orig/usr/src/cmd/mdb/common/modules/qlc/qlc.c 2014-03-01 16:18:00.000000000 +0400
+++ mdb/usr/src/cmd/mdb/common/modules/qlc/qlc.c 2014-05-03 16:24:08.487792639 +0400
@@ -259,7 +259,7 @@
{
ql_head_t ql_hba;
ql_adapter_state_t *qlstate;
- uintptr_t hbaptr = NULL;
+ uintptr_t hbaptr = 0;
if ((flags & DCMD_ADDRSPEC) || argc != 0) {
return (DCMD_USAGE);
@@ -288,7 +288,7 @@
mdb_printf("%<u>%-?s\t%-45s%</u>\n\n", "baseaddr", "instance");
hbaptr = (uintptr_t)ql_hba.first;
- while (hbaptr != NULL) {
+ while (hbaptr != 0) {
if (mdb_vread(qlstate, sizeof (ql_adapter_state_t),
hbaptr) == -1) {
@@ -309,7 +309,7 @@
(qlstate->vp_next != NULL)) {
ql_adapter_state_t *vqlstate;
- uintptr_t vhbaptr = NULL;
+ uintptr_t vhbaptr = 0;
vhbaptr = (uintptr_t)qlstate->vp_next;
@@ -325,7 +325,7 @@
mdb_printf("%<u>vp baseaddr\t\tvp index%</u>\n");
- while (vhbaptr != NULL) {
+ while (vhbaptr != 0) {
if (mdb_vread(vqlstate,
sizeof (ql_adapter_state_t), vhbaptr) ==
@@ -415,7 +415,7 @@
mdb_warn("unable to read firmware table\n");
} else {
ql_adapter_state_t *qlstate;
- uintptr_t hbaptr = NULL;
+ uintptr_t hbaptr = 0;
if (mdb_readvar(&ql_hba, "ql_hba") == -1) {
mdb_warn("failed to read ql_hba structure");
@@ -447,13 +447,13 @@
if (&ql_hba == NULL) {
mdb_warn("failed to read ql_hba structure");
- hbaptr = NULL;
+ hbaptr = 0;
} else {
hbaptr = (uintptr_t)ql_hba.first;
}
found = 0;
- while (hbaptr != NULL) {
+ while (hbaptr != 0) {
if (mdb_vread(qlstate,
sizeof (ql_adapter_state_t), hbaptr) ==
@@ -525,7 +525,7 @@
uint32_t instance;
uint32_t qlsize = sizeof (ql_adapter_state_t);
ql_adapter_state_t *qlstate;
- uintptr_t hbaptr = NULL;
+ uintptr_t hbaptr = 0;
ql_head_t ql_hba;
if ((mdbs = mdb_get_state()) == MDB_STATE_DEAD) {
@@ -590,7 +590,7 @@
hbaptr = (uintptr_t)ql_hba.first;
- while (hbaptr != NULL) {
+ while (hbaptr != 0) {
if (mdb_vread(qlstate, qlsize, hbaptr) == -1) {
mdb_free(qlstate, qlsize);
@@ -611,7 +611,7 @@
/* find the correct instance to change */
hbaptr = (uintptr_t)ql_hba.first;
- while (hbaptr != NULL) {
+ while (hbaptr != 0) {
if (mdb_vread(qlstate, qlsize, hbaptr) == -1) {
mdb_free(qlstate, qlsize);
@@ -627,7 +627,7 @@
hbaptr = (uintptr_t)qlstate->hba.next;
}
- if (hbaptr == NULL) {
+ if (hbaptr == 0) {
mdb_printf("instance %d is not loaded",
instance);
continue;
@@ -1154,7 +1154,7 @@
{
ql_head_t ql_hba;
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
if ((mdb_readvar(&ql_hba, "ql_hba") == -1) ||
(&ql_hba == NULL)) {
mdb_warn("failed to read ql_hba structure");
@@ -1189,7 +1189,7 @@
{
ql_adapter_state_t *qlstate;
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
return (WALK_DONE);
}
@@ -1259,7 +1259,7 @@
static int
qlsrb_walk_init(mdb_walk_state_t *wsp)
{
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
mdb_warn("failed to read ql_srb addr at %p",
wsp->walk_addr);
return (WALK_ERR);
@@ -1289,7 +1289,7 @@
{
ql_srb_t *qlsrb;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_DONE);
if (mdb_vread(wsp->walk_data, sizeof (ql_srb_t),
@@ -1351,7 +1351,7 @@
static int
qllunq_walk_init(mdb_walk_state_t *wsp)
{
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
mdb_warn("failed to read ql_lun addr at %p",
wsp->walk_addr);
return (WALK_ERR);
@@ -1383,7 +1383,7 @@
ql_link_t ql_link;
ql_link_t *qllink;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_DONE);
if (mdb_vread(wsp->walk_data, sizeof (ql_lun_t),
@@ -1472,7 +1472,7 @@
uint32_t index;
ql_head_t *dev;
- if ((!(flags & DCMD_ADDRSPEC)) || addr == NULL) {
+ if ((!(flags & DCMD_ADDRSPEC)) || addr == 0) {
mdb_warn("ql_hba structure addr is required");
return (DCMD_USAGE);
}
@@ -1733,10 +1733,10 @@
{
ql_adapter_state_t *ha;
ql_head_t ql_hba;
- uintptr_t hbaptr = NULL;
+ uintptr_t hbaptr = 0;
int verbose = 0;
- if ((!(flags & DCMD_ADDRSPEC)) || addr == NULL) {
+ if ((!(flags & DCMD_ADDRSPEC)) || addr == 0) {
mdb_warn("ql_adapter_state structure addr is required");
return (DCMD_USAGE);
}
@@ -1765,7 +1765,7 @@
mdb_warn("failed to read ql_hba structure -- is qlc loaded?");
} else if (verbose) {
hbaptr = (uintptr_t)ql_hba.first;
- while (hbaptr != NULL) {
+ while (hbaptr != 0) {
if (mdb_vread(ha, sizeof (ql_adapter_state_t),
hbaptr) == -1) {
@@ -3188,7 +3188,7 @@
char *dump_current = 0;
el_trace_desc_t *trace_desc;
- if ((!(flags & DCMD_ADDRSPEC)) || addr == NULL) {
+ if ((!(flags & DCMD_ADDRSPEC)) || addr == 0) {
mdb_warn("ql_adapter_state structure addr is required");
return (DCMD_USAGE);
}
@@ -3270,7 +3270,7 @@
if ((trace_next + EL_BUFFER_RESERVE) >= trace_end) {
dump_start = trace_start;
- } else if (*trace_next != NULL) {
+ } else if (*trace_next != 0) {
dump_start = trace_next + (strlen(trace_next) + 1);
} else {
dump_start = trace_start;
@@ -3300,7 +3300,7 @@
mdb_printf("Done %x", dump_current);
break;
}
- } else if (*dump_current == NULL) {
+ } else if (*dump_current == 0) {
mdb_printf("Done %x(null)", dump_current);
break;
}

58
mdb/debian/patches/mdb-rdc-NULL.patch Normal file
View File

@ -0,0 +1,58 @@
Index: mdb/usr/src/cmd/mdb/common/modules/rdc/rdc.c
===================================================================
--- mdb.orig/usr/src/cmd/mdb/common/modules/rdc/rdc.c 2014-03-01 16:18:00.000000000 +0400
+++ mdb/usr/src/cmd/mdb/common/modules/rdc/rdc.c 2014-05-03 16:25:36.777049803 +0400
@@ -85,7 +85,7 @@
winfo->start = (uintptr_t)rdc_k_info;
winfo->end = (uintptr_t)(rdc_k_info + rdc_max_sets);
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
wsp->walk_addr = winfo->start;
wsp->walk_data = winfo;
@@ -99,7 +99,7 @@
struct rdc_kinfo_winfo *winfo = wsp->walk_data;
int status;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_DONE);
if (wsp->walk_addr >= winfo->end)
@@ -154,7 +154,7 @@
winfo->start = (uintptr_t)rdc_u_info;
winfo->end = (uintptr_t)(rdc_u_info + rdc_max_sets);
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
wsp->walk_addr = winfo->start;
wsp->walk_data = winfo;
@@ -168,7 +168,7 @@
struct rdc_uinfo_winfo *winfo = wsp->walk_data;
int status;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_DONE);
if (wsp->walk_addr >= winfo->end)
@@ -196,7 +196,7 @@
static int
rdc_if_winit(mdb_walk_state_t *wsp)
{
- if (wsp->walk_addr == NULL &&
+ if (wsp->walk_addr == 0 &&
mdb_readvar(&wsp->walk_addr, "rdc_if_top") == -1) {
mdb_warn("unable to read 'rdc_if_top'");
return (WALK_ERR);
@@ -213,7 +213,7 @@
{
int status;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_DONE);
if (mdb_vread(wsp->walk_data,

22
mdb/debian/patches/mdb-s1394-NULL.patch Normal file
View File

@ -0,0 +1,22 @@
Index: mdb/usr/src/cmd/mdb/common/modules/s1394/s1394.c
===================================================================
--- mdb.orig/usr/src/cmd/mdb/common/modules/s1394/s1394.c 2014-03-01 16:18:00.000000000 +0400
+++ mdb/usr/src/cmd/mdb/common/modules/s1394/s1394.c 2014-05-03 16:27:17.660843530 +0400
@@ -66,7 +66,7 @@
s1394_state_t *statep;
s1394_state_t state;
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
if (mdb_readvar(&statep, "s1394_statep") == -1) {
mdb_warn("failed to find the s1394_statep pointer");
return (WALK_ERR);
@@ -88,7 +88,7 @@
s1394_hal_t hal;
uintptr_t addr = wsp->walk_addr;
- if (addr == NULL)
+ if (addr == 0)
return (WALK_DONE);
if (mdb_vread(&hal, sizeof (s1394_hal_t), addr) == -1) {

160
mdb/debian/patches/mdb-sctp-NULL.patch Normal file
View File

@ -0,0 +1,160 @@
Index: mdb/usr/src/cmd/mdb/common/modules/sctp/sctp.c
===================================================================
--- mdb.orig/usr/src/cmd/mdb/common/modules/sctp/sctp.c 2014-05-02 22:11:30.426792286 +0400
+++ mdb/usr/src/cmd/mdb/common/modules/sctp/sctp.c 2014-05-03 16:34:16.488608014 +0400
@@ -419,10 +419,10 @@
daddr = (uintptr_t)dmp.b_cont;
- } while (daddr != NULL);
+ } while (daddr != 0);
addr = (uintptr_t)istrmp.b_next;
- } while (addr != NULL);
+ } while (addr != 0);
return (DCMD_OK);
}
@@ -475,10 +475,10 @@
dp.sdh_tsn, bbit, ebit);
daddr = (uintptr_t)dmp.b_cont;
- } while (daddr != NULL);
+ } while (daddr != 0);
addr = (uintptr_t)srpmp.b_next;
- } while (addr != NULL);
+ } while (addr != 0);
return (DCMD_OK);
}
@@ -517,7 +517,7 @@
dp.sdh_tsn, dp.sdh_flags, ubit, bbit, ebit);
addr = (uintptr_t)dmp.b_next;
- } while (addr != NULL);
+ } while (addr != 0);
return (DCMD_OK);
}
@@ -1055,14 +1055,14 @@
sctp_t sctp;
/* first try to continue down the hash chain */
- if (fw->sctp != NULL) {
+ if (fw->sctp != 0) {
/* try to get next in hash chain */
if (mdb_vread(&sctp, sizeof (sctp), fw->sctp) == -1) {
mdb_warn("failed to read sctp at %p", fw->sctp);
- return (NULL);
+ return (0);
}
fw->sctp = fw->getnext(&sctp);
- if (fw->sctp != NULL)
+ if (fw->sctp != 0)
return (fw->sctp);
else
/* end of chain; go to next bucket */
@@ -1076,7 +1076,7 @@
(uintptr_t)(fw->fanout + fw->index)) == -1) {
mdb_warn("failed to read tf at %p",
fw->fanout + fw->index);
- return (NULL);
+ return (0);
}
if (tf.tf_sctp != NULL) {
/* start of a new chain */
@@ -1084,7 +1084,7 @@
return (fw->sctp);
}
}
- return (NULL);
+ return (0);
}
static int
@@ -1105,11 +1105,11 @@
lw = mdb_alloc(sizeof (*lw), UM_SLEEP);
lw->index = 0;
lw->size = fi->getsize(sctps);
- lw->sctp = NULL;
+ lw->sctp = 0;
lw->fanout = (sctp_tf_t *)kaddr;
lw->getnext = fi->getnext;
- if ((wsp->walk_addr = find_next_hash_item(lw)) == NULL) {
+ if ((wsp->walk_addr = find_next_hash_item(lw)) == 0) {
return (WALK_DONE);
}
wsp->walk_data = lw;
@@ -1133,7 +1133,7 @@
if (status != WALK_NEXT)
return (status);
- if ((wsp->walk_addr = find_next_hash_item(fw)) == NULL)
+ if ((wsp->walk_addr = find_next_hash_item(fw)) == 0)
return (WALK_DONE);
return (WALK_NEXT);
@@ -1203,14 +1203,14 @@
{
sctp_t sctp;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_ERR);
if (mdb_vread(&sctp, sizeof (sctp), wsp->walk_addr) == -1) {
mdb_warn("failed to read sctp at %p", wsp->walk_addr);
return (WALK_ERR);
}
- if ((wsp->walk_addr = (uintptr_t)sctp.sctp_faddrs) != NULL)
+ if ((wsp->walk_addr = (uintptr_t)sctp.sctp_faddrs) != 0)
return (WALK_NEXT);
else
return (WALK_DONE);
@@ -1230,7 +1230,7 @@
status = wsp->walk_callback(faddr_ptr, &sctp_faddr, wsp->walk_cbdata);
if (status != WALK_NEXT)
return (status);
- if ((faddr_ptr = (uintptr_t)sctp_faddr.sf_next) == NULL) {
+ if ((faddr_ptr = (uintptr_t)sctp_faddr.sf_next) == 0) {
return (WALK_DONE);
} else {
wsp->walk_addr = faddr_ptr;
@@ -1256,7 +1256,7 @@
int i;
saddr_walk_t *swalker;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_ERR);
swalker = mdb_alloc(sizeof (saddr_walk_t), UM_SLEEP);
@@ -1402,7 +1402,7 @@
}
if (mdb_vread(&iw.ills, sizeof (iw.ills), kaddr) == -1) {
mdb_warn("failed to read 'sctps_g_ills'");
- return (NULL);
+ return (0);
}
/* Find the first ill. */
@@ -1474,7 +1474,7 @@
}
if (mdb_vread(&iw.ipifs, sizeof (iw.ipifs), kaddr) == -1) {
mdb_warn("failed to read 'sctps_g_ipifs'");
- return (NULL);
+ return (0);
}
/* Find the first ipif. */
@@ -1509,7 +1509,7 @@
{
sctp_stack_t sctps;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_ERR);
if (mdb_vread(&sctps, sizeof (sctps), wsp->walk_addr) == -1) {

58
mdb/debian/patches/mdb-sd-NULL.patch Normal file
View File

@ -0,0 +1,58 @@
Index: mdb/usr/src/cmd/mdb/common/modules/sd/sd.c
===================================================================
--- mdb.orig/usr/src/cmd/mdb/common/modules/sd/sd.c 2014-03-01 16:18:00.000000000 +0400
+++ mdb/usr/src/cmd/mdb/common/modules/sd/sd.c 2014-05-03 16:38:46.425886067 +0400
@@ -95,7 +95,7 @@
static int
buf_avforw_walk_init(mdb_walk_state_t *wsp)
{
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
mdb_warn("buffer address required with the command\n");
return (WALK_ERR);
}
@@ -127,7 +127,7 @@
* if walk_addr is null then it effectively means an end of all
* buf structures, hence end the iterations.
*/
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
return (WALK_DONE);
}
@@ -308,7 +308,7 @@
static int
sd_state_walk_init(mdb_walk_state_t *wsp)
{
- if (wsp->walk_addr == NULL &&
+ if (wsp->walk_addr == 0 &&
mdb_readvar(&wsp->walk_addr, "sd_state") == -1) {
mdb_warn("failed to read 'sd_state'");
return (WALK_ERR);
@@ -458,7 +458,7 @@
rootBuf = (uintptr_t)currentBuf.av_forw;
}
- if (rootBuf == NULL) {
+ if (rootBuf == 0) {
mdb_printf("------------------------------\n");
mdb_printf("Processed %d SEMOCLOSE SLEEP Q entries\n",
semo_sleepq_count);
@@ -516,7 +516,7 @@
++sdLunQ_count;
}
- if (rootBuf == NULL) {
+ if (rootBuf == 0) {
mdb_printf("------------------------------\n");
mdb_printf("Processed %d UN WAIT Q entries\n", sdLunQ_count);
mdb_printf("------------------------------\n");
@@ -543,7 +543,7 @@
void *xba_root;
int xbuf_q_count = 0;
- if (xbuf_attr == NULL) {
+ if (xbuf_attr == 0) {
mdb_printf("---------------------------\n");
mdb_printf("No XBUF ATTR entry\n");
mdb_printf("---------------------------\n");

238
mdb/debian/patches/mdb-sdbc-NULL.patch Normal file
View File

@ -0,0 +1,238 @@
Index: mdb/usr/src/cmd/mdb/common/modules/sdbc/sdbc.c
===================================================================
--- mdb.orig/usr/src/cmd/mdb/common/modules/sdbc/sdbc.c 2014-05-02 22:11:30.739415465 +0400
+++ mdb/usr/src/cmd/mdb/common/modules/sdbc/sdbc.c 2014-05-03 16:40:31.866567633 +0400
@@ -776,7 +776,7 @@
winfo = mdb_zalloc(sizeof (struct walk_info), UM_SLEEP);
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
/*
* we get the "first" cctl from memory and then traverse
* the cc_link_list_dm pointers.
@@ -805,7 +805,7 @@
_sd_cctl_t centry;
int status;
- if (wsp->walk_addr == NULL) /* should not happen */
+ if (wsp->walk_addr == 0) /* should not happen */
return (WALK_DONE);
/*
@@ -842,7 +842,7 @@
static int
sdbc_cchain_winit(mdb_walk_state_t *wsp)
{
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_ERR);
wsp->walk_data = mdb_zalloc(sizeof (_sd_cctl_t), UM_SLEEP);
@@ -855,7 +855,7 @@
{
int status;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_DONE);
if (mdb_vread(wsp->walk_data, sizeof (_sd_cctl_t), wsp->walk_addr)
@@ -887,7 +887,7 @@
static int
sdbc_dchain_winit(mdb_walk_state_t *wsp)
{
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_ERR);
wsp->walk_data = mdb_zalloc(sizeof (_sd_cctl_t), UM_SLEEP);
@@ -909,7 +909,7 @@
_sd_cctl_t centry;
int status;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_DONE);
status = wsp->walk_callback(wsp->walk_addr, wsp->walk_data,
@@ -927,7 +927,7 @@
(uintptr_t)(centry.cc_dirty_next);
/* end of dirty_next chain? start on subsequent dirty_link */
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
wsp->walk_addr =
(uintptr_t)(((_sd_cctl_t *)(wsp->walk_data))->cc_dirty_link);
@@ -966,7 +966,7 @@
static int
sdbc_dmchain_winit(mdb_walk_state_t *wsp)
{
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_ERR);
wsp->walk_data = (void *)GET_HEAD_DM;
@@ -980,7 +980,7 @@
_sd_cctl_t centry;
int status;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_DONE);
if (mdb_vread(&centry, sizeof (_sd_cctl_t), wsp->walk_addr)
@@ -1017,7 +1017,7 @@
sdbc_hashchain_winit(mdb_walk_state_t *wsp)
{
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_ERR);
@@ -1031,7 +1031,7 @@
_sd_hash_hd_t hash_entry;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_DONE);
status = wsp->walk_callback(wsp->walk_addr, wsp->walk_data,
@@ -1068,7 +1068,7 @@
winfo = mdb_zalloc(sizeof (struct walk_info), UM_SLEEP);
/* if called without an address, start at the head of the queue */
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
if (mdb_lookup_by_obj("sdbc", "_sd_lru_q", &sym) == -1) {
mdb_warn("failed to lookup _sd_lru_q symbol");
@@ -1093,7 +1093,7 @@
_sd_cctl_t centry;
int status;
- if (wsp->walk_addr == NULL) /* should not happen */
+ if (wsp->walk_addr == 0) /* should not happen */
return (WALK_DONE);
/*
@@ -1148,7 +1148,7 @@
return (WALK_ERR);
}
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
wsp->walk_addr = (uintptr_t)(_sd_net_config.sn_wr_cctl);
/*
@@ -1176,7 +1176,7 @@
struct walk_info *winfo = wsp->walk_data;
int status;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_DONE);
if (wsp->walk_addr >= winfo->w_end)
@@ -1208,7 +1208,7 @@
_sd_writeq_t wrq;
/* if called without an address, start at the head of the queue */
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
if (mdb_readvar(&_sd_net_config, "_sd_net_config") == -1) {
mdb_warn("failed to read _sd_net_config structure");
@@ -1228,7 +1228,7 @@
_sd_wr_cctl_t wctl;
int status;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_DONE);
status = wsp->walk_callback(wsp->walk_addr, wsp->walk_data,
@@ -1275,7 +1275,7 @@
}
/* if called without an address, start at the head of the queue */
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
/* address of first _sd_cd_info_t */
wsp->walk_addr = (uintptr_t)(_sd_cache_files_addr);
}
@@ -1336,7 +1336,7 @@
return (WALK_ERR);
}
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
wsp->walk_addr = (uintptr_t)(_sd_net_config.sn_ft_cctl);
/*
@@ -1364,7 +1364,7 @@
struct walk_info *winfo = wsp->walk_data;
int status;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_DONE);
if (wsp->walk_addr >= winfo->w_end)
@@ -1406,7 +1406,7 @@
}
/* if called without an address, start at first element in list */
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
wsp->walk_addr = (uintptr_t)(hl.hl_top.bh_next);
winfo = mdb_zalloc(sizeof (struct walk_info), UM_SLEEP);
@@ -1424,7 +1424,7 @@
_sd_buf_handle_t handle;
int status;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_DONE);
if (wsp->walk_addr == winfo->w_end)
@@ -1477,7 +1477,7 @@
return (WALK_ERR);
}
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
wsp->walk_addr = (uintptr_t)(gl_centry_info);
@@ -1494,7 +1494,7 @@
struct walk_info *winfo = wsp->walk_data;
int status;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_DONE);
if (wsp->walk_addr >= winfo->w_end)
@@ -1533,7 +1533,7 @@
}
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
wsp->walk_addr = (uintptr_t)(gl_file_info);
/* get the number of volumes */
@@ -1556,7 +1556,7 @@
struct walk_info *winfo = wsp->walk_data;
int status;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_DONE);
if (wsp->walk_addr >= winfo->w_end)

22
mdb/debian/patches/mdb-smbsrv-NULL.patch Normal file
View File

@ -0,0 +1,22 @@
Index: mdb/usr/src/cmd/mdb/common/modules/smbsrv/smbsrv.c
===================================================================
--- mdb.orig/usr/src/cmd/mdb/common/modules/smbsrv/smbsrv.c 2014-03-01 16:18:00.000000000 +0400
+++ mdb/usr/src/cmd/mdb/common/modules/smbsrv/smbsrv.c 2014-05-03 16:42:06.759167289 +0400
@@ -1482,7 +1482,7 @@
{
GElf_Sym sym;
- if (wsp->walk_addr != NULL) {
+ if (wsp->walk_addr != 0) {
mdb_printf("smb_vfs walk only supports global walks\n");
return (WALK_ERR);
}
@@ -1738,7 +1738,7 @@
int i;
uintptr_t node_hash_table_addr;
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
if (mdb_lookup_by_name("smb_node_hash_table", &sym) == -1) {
mdb_warn("failed to find 'smb_node_hash_table'");
return (WALK_ERR);

13
mdb/debian/patches/mdb-specfs-NULL.patch Normal file
View File

@ -0,0 +1,13 @@
Index: mdb/usr/src/cmd/mdb/common/modules/specfs/specfs.c
===================================================================
--- mdb.orig/usr/src/cmd/mdb/common/modules/specfs/specfs.c 2014-03-01 16:18:00.000000000 +0400
+++ mdb/usr/src/cmd/mdb/common/modules/specfs/specfs.c 2014-05-03 16:43:22.763059309 +0400
@@ -84,7 +84,7 @@
struct snode *sp;
struct snode snode;
- while (addr == NULL) {
+ while (addr == 0) {
if (--sw->sw_stablesz == 0)
return (WALK_DONE);

93
mdb/debian/patches/mdb-sppp-NULL.patch Normal file
View File

@ -0,0 +1,93 @@
Index: mdb/usr/src/cmd/mdb/common/modules/sppp/sppp.c
===================================================================
--- mdb.orig/usr/src/cmd/mdb/common/modules/sppp/sppp.c 2014-03-01 16:18:00.000000000 +0400
+++ mdb/usr/src/cmd/mdb/common/modules/sppp/sppp.c 2014-05-03 16:45:39.546121752 +0400
@@ -64,7 +64,7 @@
spppstr_t sps;
int status;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_DONE);
if (mdb_vread(&sps, sizeof (sps), wsp->walk_addr) == -1) {
@@ -110,7 +110,7 @@
upaddr = (uintptr_t)sps->sps_rq;
upq.q_ptr = NULL;
illaddr = 0;
- while (upaddr != NULL) {
+ while (upaddr != 0) {
if (mdb_vread(&upq, sizeof (upq), upaddr) == -1) {
upq.q_ptr = NULL;
break;
@@ -219,7 +219,7 @@
sppa_t ppa;
int status;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_DONE);
if (mdb_vread(&ppa, sizeof (ppa), wsp->walk_addr) == -1) {
@@ -294,7 +294,7 @@
if (mdb_vread(&sps, sizeof (sps), (uintptr_t)q->q_ptr) == sizeof (sps))
return ((uintptr_t)sps.sps_rq);
- return (NULL);
+ return (0);
}
static uintptr_t
@@ -304,14 +304,14 @@
sppa_t ppa;
if (mdb_vread(&sps, sizeof (sps), (uintptr_t)q->q_ptr) != sizeof (sps))
- return (NULL);
+ return (0);
if (sps.sps_ppa != NULL &&
mdb_vread(&ppa, sizeof (ppa), (uintptr_t)sps.sps_ppa) ==
sizeof (ppa))
return ((uintptr_t)ppa.ppa_lower_wq);
- return (NULL);
+ return (0);
}
/* ****************** sppptun ****************** */
@@ -387,7 +387,7 @@
struct tcl_walk_data *twd;
uintptr_t addr;
- if (wsp == NULL || wsp->walk_addr == NULL)
+ if (wsp == NULL || wsp->walk_addr == 0)
return (WALK_DONE);
twd = (struct tcl_walk_data *)wsp->walk_addr;
@@ -627,7 +627,7 @@
union tun_state ts;
if (tun_state_read(q->q_ptr, &ts) == -1)
- return (NULL);
+ return (0);
if (ts.tcl.tcl_flags & TCLF_ISCLIENT) {
return ((uintptr_t)ts.tcl.tcl_rq);
@@ -643,14 +643,14 @@
union tun_state ts;
if (tun_state_read(q->q_ptr, &ts) == -1)
- return (NULL);
+ return (0);
if (ts.tcl.tcl_flags & TCLF_ISCLIENT) {
if (ts.tcl.tcl_data_tll == NULL)
- return (NULL);
+ return (0);
if (mdb_vread(&ts.tll, sizeof (ts.tll),
(uintptr_t)ts.tcl.tcl_data_tll) != sizeof (ts.tll)) {
- return (NULL);
+ return (0);
}
}
return ((uintptr_t)ts.tll.tll_wq);

67
mdb/debian/patches/mdb-srpt-NULL.patch Normal file
View File

@ -0,0 +1,67 @@
Index: mdb/usr/src/cmd/mdb/common/modules/srpt/srpt.c
===================================================================
--- mdb.orig/usr/src/cmd/mdb/common/modules/srpt/srpt.c 2014-03-01 16:18:00.000000000 +0400
+++ mdb/usr/src/cmd/mdb/common/modules/srpt/srpt.c 2014-05-03 16:46:59.002031657 +0400
@@ -76,7 +76,7 @@
static int
srpt_list_walk_step(mdb_walk_state_t *wsp)
{
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
return (WALK_DONE);
}
return (wsp->walk_callback(wsp->walk_addr, wsp->walk_layer,
@@ -96,7 +96,7 @@
* Input should be a srpt_ioc_t, read it to get the
* srpt_target_port_t
*/
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
mdb_warn("<srpt_ioc_t addr>::walk srpt_target\n");
return (WALK_ERR);
}
@@ -114,7 +114,7 @@
static int
srpt_tgt_walk_step(mdb_walk_state_t *wsp)
{
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
return (WALK_DONE);
}
@@ -143,7 +143,7 @@
* Input should be a srpt_target_port_t, read it to get the
* list of channels
*/
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
mdb_warn("<srpt_target_port_t addr>::walk srpt_channel\n");
return (WALK_ERR);
}
@@ -168,7 +168,7 @@
* Input should be a srpt_target_port_t, read it to get the
* srpt_session_t
*/
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
mdb_warn("<srpt_target_port_t addr>::walk srpt_scsi_session\n");
return (WALK_ERR);
}
@@ -189,7 +189,7 @@
static int
srpt_task_walk_init(mdb_walk_state_t *wsp)
{
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
mdb_warn("<srpt_session_t addr>::walk srpt_tasks\n");
return (WALK_ERR);
}
@@ -211,7 +211,7 @@
char mask[9];
int i;
- if (addr == NULL) {
+ if (addr == 0) {
mdb_warn("address of srpt_ioc should be specified\n");
return (DCMD_ERR);
}

145
mdb/debian/patches/mdb-stmf-NULL.patch Normal file
View File

@ -0,0 +1,145 @@
Index: mdb/usr/src/cmd/mdb/common/modules/stmf/stmf.c
===================================================================
--- mdb.orig/usr/src/cmd/mdb/common/modules/stmf/stmf.c 2014-05-02 22:11:31.611329259 +0400
+++ mdb/usr/src/cmd/mdb/common/modules/stmf/stmf.c 2014-05-03 16:49:26.181941870 +0400
@@ -42,7 +42,7 @@
static int
stmf_ilport_walk_i(mdb_walk_state_t *wsp)
{
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
struct stmf_state state;
if (mdb_readsym(&state, sizeof (struct stmf_state),
@@ -62,7 +62,7 @@
{
int status = WALK_NEXT;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_DONE);
if (mdb_vread(wsp->walk_data, sizeof (struct stmf_i_local_port),
@@ -167,12 +167,12 @@
struct stmf_i_local_port *
next_stmf_port(mdb_walk_state_t *wsp)
{
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
if (stmf_ilport_walk_i(wsp) == WALK_ERR) {
stmf_ilport_walk_f(wsp);
return (NULL);
}
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
stmf_ilport_walk_f(wsp);
return ((struct stmf_i_local_port *)wsp->walk_addr);
}
@@ -181,7 +181,7 @@
stmf_ilport_walk_f(wsp);
return (NULL);
}
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
stmf_ilport_walk_f(wsp);
return ((struct stmf_i_local_port *)wsp->walk_addr);
}
@@ -209,7 +209,7 @@
}
}
- if (addr == NULL) {
+ if (addr == 0) {
mdb_warn("address of stmf_i_local_port should be specified\n");
return (DCMD_ERR);
}
@@ -561,7 +561,7 @@
struct fct_local_port port;
struct fct_i_local_port iport;
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
mdb_warn("Can not perform global walk");
return (WALK_ERR);
}
@@ -595,7 +595,7 @@
int status = WALK_NEXT;
fct_i_remote_port_t *rp;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_DONE);
if (rp_index++ >= port_max_logins)
@@ -621,7 +621,7 @@
static void
fct_irp_walk_f(mdb_walk_state_t *wsp)
{
- wsp->walk_addr = NULL;
+ wsp->walk_addr = 0;
}
/*
@@ -688,7 +688,7 @@
return (DCMD_OK);
}
-static uintptr_t cur_iport_for_irp_loop = NULL;
+static uintptr_t cur_iport_for_irp_loop = 0;
static fct_i_remote_port_t *
next_rport(struct fct_i_local_port *iport)
@@ -698,7 +698,7 @@
int ret;
fct_i_remote_port_t *irp;
- if (ws.walk_addr == NULL || cur_iport_for_irp_loop !=
+ if (ws.walk_addr == 0 || cur_iport_for_irp_loop !=
(uintptr_t)iport) {
*((fct_i_remote_port_t **)ws.walk_cbdata) = NULL;
cur_iport_for_irp_loop = (uintptr_t)iport;
@@ -707,7 +707,7 @@
fct_irp_walk_f(&ws);
return (NULL);
}
- if (ws.walk_addr == NULL) {
+ if (ws.walk_addr == 0) {
fct_irp_walk_f(&ws);
return (NULL);
}
@@ -805,7 +805,7 @@
break;
}
}
- cur_iport_for_irp_loop = NULL;
+ cur_iport_for_irp_loop = 0;
return (ret);
}
@@ -1142,7 +1142,7 @@
* Input should be a stmf_worker, so read it to get the
* worker_task_head to get the start of the task list
*/
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
mdb_warn("<worker addr>::walk stmf_scsi_task\n");
return (WALK_ERR);
}
@@ -1165,7 +1165,7 @@
stmf_i_scsi_task_t itask;
int status;
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
return (WALK_DONE);
}
@@ -1329,7 +1329,7 @@
stmf_worker_walk_data_t *walk_data = wsp->walk_data;
int status;
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
return (WALK_DONE);
}

58
mdb/debian/patches/mdb-stmf_sbd-NULL.patch Normal file
View File

@ -0,0 +1,58 @@
Index: mdb/usr/src/cmd/mdb/common/modules/stmf_sbd/stmf_sbd.c
===================================================================
--- mdb.orig/usr/src/cmd/mdb/common/modules/stmf_sbd/stmf_sbd.c 2014-05-02 22:11:31.615605418 +0400
+++ mdb/usr/src/cmd/mdb/common/modules/stmf_sbd/stmf_sbd.c 2014-05-03 16:51:07.615085712 +0400
@@ -257,7 +257,7 @@
static int
stmf_sbd_lu_walk_init(mdb_walk_state_t *wsp)
{
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
if (mdb_readvar(&wsp->walk_addr, "sbd_lu_list") == -1) {
mdb_warn("failed to read sbd_lu_list\n");
return (WALK_ERR);
@@ -272,7 +272,7 @@
uintptr_t addr = wsp->walk_addr;
sbd_lu_t slu;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_DONE);
if (mdb_vread(&slu, sizeof (sbd_lu_t), addr) == -1) {
@@ -326,7 +326,7 @@
static int
stmf_sbd_pgr_key_walk_init(mdb_walk_state_t *wsp)
{
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
mdb_warn("<pgr_key_list addr>::walk stmf_sbd_pgr_key\n");
return (WALK_ERR);
}
@@ -339,7 +339,7 @@
uintptr_t addr = wsp->walk_addr;
sbd_pgr_key_t key;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_DONE);
if (mdb_vread(&key, sizeof (sbd_pgr_key_t), addr) == -1) {
@@ -383,7 +383,7 @@
static int
stmf_sbd_it_walk_init(mdb_walk_state_t *wsp)
{
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
mdb_warn("<sbd_it_list addr>::walk stmf_sbd_pgr_key\n");
return (WALK_ERR);
}
@@ -396,7 +396,7 @@
uintptr_t addr = wsp->walk_addr;
sbd_it_data_t it;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_DONE);
if (mdb_vread(&it, sizeof (sbd_it_data_t), addr) == -1) {

76
mdb/debian/patches/mdb-sv-NULL.patch Normal file
View File

@ -0,0 +1,76 @@
Index: mdb/usr/src/cmd/mdb/common/modules/sv/sv.c
===================================================================
--- mdb.orig/usr/src/cmd/mdb/common/modules/sv/sv.c 2014-03-01 16:18:00.000000000 +0400
+++ mdb/usr/src/cmd/mdb/common/modules/sv/sv.c 2014-05-03 16:53:53.390811051 +0400
@@ -73,7 +73,7 @@
winfo->start = (uintptr_t)sv_devs;
winfo->end = (uintptr_t)(sv_devs + sv_max_devices);
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
wsp->walk_addr = winfo->start;
wsp->walk_data = winfo;
@@ -87,7 +87,7 @@
struct sv_dev_winfo *winfo = wsp->walk_data;
int status;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_DONE);
if (wsp->walk_addr >= winfo->end)
@@ -116,7 +116,7 @@
static int
sv_hash_winit(mdb_walk_state_t *wsp)
{
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_ERR);
wsp->walk_data = mdb_zalloc(sizeof (sv_dev_t), UM_SLEEP);
@@ -130,7 +130,7 @@
{
int status;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_DONE);
if (mdb_vread(wsp->walk_data,
@@ -164,7 +164,7 @@
static int
sv_maj_winit(mdb_walk_state_t *wsp)
{
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
if (mdb_readvar(&sv_majors, "sv_majors") == -1) {
mdb_warn("failed to read 'sv_majors'");
return (WALK_ERR);
@@ -186,7 +186,7 @@
uintptr_t addr;
int status = DCMD_OK;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_DONE);
if (wsp->walk_addr >= (uintptr_t)&sv_majors[SV_MAJOR_HASH_CNT])
@@ -228,7 +228,7 @@
static int
sv_gclient_winit(mdb_walk_state_t *wsp)
{
- if (wsp->walk_addr == NULL &&
+ if (wsp->walk_addr == 0 &&
mdb_readvar(&wsp->walk_addr, "sv_gclients") == -1) {
mdb_warn("unable to read 'sv_gclients'");
return (WALK_ERR);
@@ -245,7 +245,7 @@
{
int status;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_DONE);
if (mdb_vread(wsp->walk_data,

93
mdb/debian/patches/mdb-ufs-NULL.patch Normal file
View File

@ -0,0 +1,93 @@
Index: mdb/usr/src/cmd/mdb/common/modules/ufs/ufs.c
===================================================================
--- mdb.orig/usr/src/cmd/mdb/common/modules/ufs/ufs.c 2014-03-01 16:18:00.000000000 +0400
+++ mdb/usr/src/cmd/mdb/common/modules/ufs/ufs.c 2014-05-03 16:57:39.143100338 +0400
@@ -50,7 +50,7 @@
union ihead ih;
inode_walk_data_t *iw;
- if (wsp->walk_addr != NULL) {
+ if (wsp->walk_addr != 0) {
mdb_warn("inode_cache only supports global walks\n");
return (WALK_ERR);
}
@@ -342,7 +342,7 @@
si_t *si;
ufs_ic_acl_t **aclpp;
- if (addr == NULL) {
+ if (addr == 0) {
mdb_warn("acl walk needs an inode address\n");
return (WALK_ERR);
}
@@ -382,7 +382,7 @@
ufs_ic_acl_t **aclpp;
ufs_ic_acl_t acl;
- while (addr == NULL) {
+ while (addr == 0) {
wsp->walk_arg = (void *)(uintptr_t)++i;
if (acl_map[i].am_offset == -1)
Index: mdb/usr/src/cmd/mdb/common/modules/ufs/ufs_log.c
===================================================================
--- mdb.orig/usr/src/cmd/mdb/common/modules/ufs/ufs_log.c 2014-03-01 16:18:00.000000000 +0400
+++ mdb/usr/src/cmd/mdb/common/modules/ufs/ufs_log.c 2014-05-03 16:58:53.026755824 +0400
@@ -50,7 +50,7 @@
{
ufslogmap_walk_data_t *uw;
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
mdb_warn("must specify an address\n");
return (WALK_ERR);
}
Index: mdb/usr/src/cmd/mdb/common/modules/usba/usba.c
===================================================================
--- mdb.orig/usr/src/cmd/mdb/common/modules/usba/usba.c 2014-03-01 16:18:00.000000000 +0400
+++ mdb/usr/src/cmd/mdb/common/modules/usba/usba.c 2014-05-03 17:01:24.862683585 +0400
@@ -48,7 +48,7 @@
{
uintptr_t p = (uintptr_t)dip->devi_hw_prop_ptr;
- while (p != NULL) {
+ while (p != 0) {
ddi_prop_t prop;
char prop_name[128];
@@ -98,7 +98,7 @@
if (mdb_vread(&devinfo, sizeof (struct dev_info), dip_addr) == -1) {
mdb_warn("failed to read dev_info at %p", dip_addr);
- return (NULL);
+ return (0);
}
/*
@@ -114,7 +114,7 @@
if (!hcdi_addr) {
- return (NULL);
+ return (0);
}
/* Read hcdi struct into local address space. */
@@ -122,7 +122,7 @@
hcdi_addr) == -1) {
mdb_warn("failed to read hcdi struct");
- return (NULL);
+ return (0);
}
return ((uintptr_t)hcdi_struct.hcdi_usba_device);
@@ -134,7 +134,7 @@
dip_addr) == -1) {
mdb_warn("failed to read dev_info at %p", dip_addr);
- return (NULL);
+ return (0);
}
/* casts needed to keep lint happy */

121
mdb/debian/patches/mdb-uhci-NULL.patch Normal file
View File

@ -0,0 +1,121 @@
Index: mdb/usr/src/cmd/mdb/common/modules/uhci/uhci.c
===================================================================
--- mdb.orig/usr/src/cmd/mdb/common/modules/uhci/uhci.c 2014-03-01 16:18:00.000000000 +0400
+++ mdb/usr/src/cmd/mdb/common/modules/uhci/uhci.c 2014-05-03 17:06:45.016219861 +0400
@@ -233,7 +233,7 @@
mdb_printf("\n UHCI td struct at (vaddr) %08x:\n", addr);
- if (!(td.link_ptr & HC_END_OF_LIST) && td.link_ptr != NULL) {
+ if (!(td.link_ptr & HC_END_OF_LIST) && td.link_ptr != 0) {
mdb_printf(" link_ptr (paddr) : %-8x "
"(vaddr) : %p\n",
td.link_ptr,
@@ -260,7 +260,7 @@
"startingframe: %0x\n", td.isoc_pkt_index, td.starting_frame);
- if (td.link_ptr == NULL) {
+ if (td.link_ptr == 0) {
mdb_printf(" --> Link pointer = NULL\n");
return (DCMD_ERR);
} else {
@@ -345,7 +345,7 @@
mdb_printf("\n UHCI qh struct at (vaddr) %08x:\n", addr);
- if (!(qh.link_ptr & HC_END_OF_LIST) && qh.link_ptr != NULL) {
+ if (!(qh.link_ptr & HC_END_OF_LIST) && qh.link_ptr != 0) {
mdb_printf(" link_ptr (paddr) : %08x "
"(vaddr) : %p\n",
qh.link_ptr,
@@ -357,7 +357,7 @@
qh.link_ptr);
}
- if (!(qh.element_ptr & HC_END_OF_LIST) && qh.element_ptr != NULL) {
+ if (!(qh.element_ptr & HC_END_OF_LIST) && qh.element_ptr != 0) {
mdb_printf(" element_ptr (paddr) : %08x "
"(vaddr) : %p\n",
qh.element_ptr,
@@ -377,7 +377,7 @@
mdb_printf(" bulk_xfer_isoc_info : %?p\n", qh.bulk_xfer_info);
- if (qh.link_ptr == NULL) {
+ if (qh.link_ptr == 0) {
mdb_printf(" --> Link pointer = NULL\n");
return (DCMD_ERR);
} else {
@@ -400,7 +400,7 @@
}
- if (qh.element_ptr == NULL) {
+ if (qh.element_ptr == 0) {
mdb_printf(" element_ptr = NULL\n");
return (DCMD_ERR);
} else {
@@ -451,7 +451,7 @@
int
uhci_td_walk_init(mdb_walk_state_t *wsp)
{
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
return (DCMD_USAGE);
}
@@ -497,7 +497,7 @@
wsp->walk_addr = ((uhci_td_t *)wsp->walk_data)->link_ptr;
/* Check if we're at the last element */
- if (wsp->walk_addr == NULL || wsp->walk_addr & HC_END_OF_LIST)
+ if (wsp->walk_addr == 0 || wsp->walk_addr & HC_END_OF_LIST)
return (WALK_DONE);
/* Make sure next element is a TD. If a QH, stop. */
@@ -509,7 +509,7 @@
/* Strip terminate etc. bits. */
wsp->walk_addr &= QH_LINK_PTR_MASK; /* there is no TD_LINK_PTR_MASK */
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_DONE);
/*
@@ -530,7 +530,7 @@
int
uhci_qh_walk_init(mdb_walk_state_t *wsp)
{
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (DCMD_USAGE);
wsp->walk_data = mdb_alloc(sizeof (queue_head_t), UM_SLEEP | UM_GC);
@@ -562,7 +562,7 @@
uhci_state_t *uhcip = (uhci_state_t *)wsp->walk_arg;
- if (wsp->walk_addr == NULL) /* Should never occur */
+ if (wsp->walk_addr == 0) /* Should never occur */
return (WALK_DONE);
if (mdb_vread(wsp->walk_data, sizeof (queue_head_t), wsp->walk_addr)
@@ -579,7 +579,7 @@
/* Check if we're at the last element */
- if (wsp->walk_addr == NULL || wsp->walk_addr & HC_END_OF_LIST) {
+ if (wsp->walk_addr == 0 || wsp->walk_addr & HC_END_OF_LIST) {
return (WALK_DONE);
}
@@ -592,7 +592,7 @@
/* Strip terminate etc. bits. */
wsp->walk_addr &= QH_LINK_PTR_MASK;
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_DONE);
/*

91
mdb/debian/patches/mdb-zfs-NULL.patch Normal file
View File

@ -0,0 +1,91 @@
Index: mdb/usr/src/cmd/mdb/common/modules/zfs/zfs.c
===================================================================
--- mdb.orig/usr/src/cmd/mdb/common/modules/zfs/zfs.c 2014-05-02 22:11:28.351021642 +0400
+++ mdb/usr/src/cmd/mdb/common/modules/zfs/zfs.c 2014-05-03 12:05:26.026038277 +0400
@@ -123,7 +123,7 @@
static int
freelist_walk_init(mdb_walk_state_t *wsp)
{
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
mdb_warn("must supply starting address\n");
return (WALK_ERR);
}
@@ -1412,7 +1412,7 @@
uintptr_t root_vdevp;
uintptr_t childp;
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
mdb_warn("must supply address of spa_t\n");
return (WALK_ERR);
}
@@ -1522,7 +1522,7 @@
"mdb_space_map_t", ms.ms_sm, 0) == -1)
return (WALK_ERR);
- if (sm.sm_phys != NULL) {
+ if (sm.sm_phys != 0) {
(void) mdb_ctf_vread(&smp, "space_map_phys_t",
"mdb_space_map_phys_t", sm.sm_phys, 0);
}
@@ -1710,7 +1710,7 @@
/*
* Unitialized spa_t structures can have a NULL root vdev.
*/
- if (spa.spa_root_vdev == NULL) {
+ if (spa.spa_root_vdev == 0) {
mdb_printf("no associated vdevs\n");
return (DCMD_OK);
}
@@ -2013,12 +2013,12 @@
txg_node_t *node;
int status;
- while (wsp->walk_addr == NULL && lwd->lw_txgoff < lwd->lw_maxoff) {
+ while (wsp->walk_addr == 0 && lwd->lw_txgoff < lwd->lw_maxoff) {
lwd->lw_txgoff++;
wsp->walk_addr = lwd->lw_head[lwd->lw_txgoff];
}
- if (wsp->walk_addr == NULL)
+ if (wsp->walk_addr == 0)
return (WALK_DONE);
addr = wsp->walk_addr - lwd->lw_offset;
@@ -2047,7 +2047,7 @@
{
GElf_Sym sym;
- if (wsp->walk_addr != NULL) {
+ if (wsp->walk_addr != 0) {
mdb_warn("spa walk only supports global walks\n");
return (WALK_ERR);
}
@@ -2541,7 +2541,7 @@
}
if (bonus_tab && !TOC_ATTR_PRESENT(offset_tab[attr_id]) &&
- spill_tab == NULL) {
+ spill_tab == 0) {
mdb_printf("Attribute does not exist\n");
return (DCMD_ERR);
} else if (!TOC_ATTR_PRESENT(offset_tab[attr_id]) && spill_tab) {
@@ -2855,7 +2855,7 @@
static int
zfs_acl_node_walk_init(mdb_walk_state_t *wsp)
{
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
mdb_warn("must supply address of zfs_acl_node_t\n");
return (WALK_ERR);
}
@@ -2896,7 +2896,7 @@
{
ace_walk_data_t *ace_walk_data;
- if (wsp->walk_addr == NULL) {
+ if (wsp->walk_addr == 0) {
mdb_warn("must supply address of zfs_acl_node_t\n");
return (WALK_ERR);
}

37
mdb/debian/patches/series
View File

@ -87,3 +87,40 @@ mdb-sppp-includes.patch
mdb-comstar-includes.patch
mdb-stmf-includes.patch
mdb-usba-NULL.patch
mdb-zfs-NULL.patch
mdb-mdb_ds-NULL.patch
mdb-cpc-NULL.patch
mdb-crypto-NULL.patch
mdb-dtrace-NULL.patch
mdb-fcip-NULL.patch
mdb-fcp-NULL.patch
mdb-fctl-NULL.patch
mdb-hook-NULL.patch
mdb-idm-NULL.patch
mdb-ip-NULL.patch
mdb-ipc-NULL.patch
mdb-ipp-NULL.patch
mdb-krtld-NULL.patch
mdb-lofs-NULL.patch
mdb-mac-NULL.patch
mdb-md-NULL.patch
mdb-mpt_sas-NULL.patch
mdb-nsctl-NULL.patch
mdb-nsmb-NULL.patch
mdb-pmcs-NULL.patch
mdb-ptm-NULL.patch
mdb-qlc-NULL.patch
mdb-rdc-NULL.patch
mdb-s1394-NULL.patch
mdb-sctp-NULL.patch
mdb-sd-NULL.patch
mdb-sdbc-NULL.patch
mdb-smbsrv-NULL.patch
mdb-specfs-NULL.patch
mdb-sppp-NULL.patch
mdb-srpt-NULL.patch
mdb-stmf-NULL.patch
mdb-stmf_sbd-NULL.patch
mdb-sv-NULL.patch
mdb-ufs-NULL.patch
mdb-uhci-NULL.patch

14
mdb/debian/rules
View File

@ -8,8 +8,10 @@ cmd := \
mdb \
man := \
usr/src/man/man1/adb.1 \
usr/src/man/man1/kmdb.1 \
usr/src/man/man1/mdb.1 \
usr/src/man/man1/adb.1
usr/src/man/man7d/kmdb.7d
ifeq (amd64,$(DEB_HOST_ARCH_CPU))
dirs = usr/src/cmd/mdb/intel/amd64
@ -149,14 +151,14 @@ install-stamp: build-stamp
touch $@
build build-arch build-indep: build-stamp
build-stamp: dirs-stamp patch-stamp headers-stamp kdrv
build-stamp: dirs-stamp patch-stamp headers-stamp kmdb
dh_illumos_make -m sunmake --native \
usr/src/cmd/mdb/tools
dh_illumos_make -m sunmake \
$(dirs)
touch $@
kdrv: kdrv.o
kmdb: kdrv.o
sunld -r -dy -Nmisc/kmdbmod -o $@ $<
# XXX yes, -mcmodel=kernel is for amd64 only
@ -183,8 +185,8 @@ endif
dh_compress -X /examples/
dh_fixperms
dh_installdeb
dh_shlibdeps
dh_strip
dh_shlibdeps -X kernel
dh_strip -X kernel
dh_gencontrol
dh_md5sums
dh_builddeb
@ -194,6 +196,6 @@ clean: unpatch
dh_testdir
dh_testroot
rm -rf usr .pc
rm -f kdrv kdrv.o
rm -f kmdb kdrv.o
dh_clean