diff options
| author | joerg <joerg@pkgsrc.org> | 2013-03-02 17:56:13 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2013-03-02 17:56:13 +0000 |
| commit | 60549bf838b306ddad18c082d3b63b551645b039 (patch) | |
| tree | 9be327f797b50c48af139b0ee8ef6cafecc1bfb2 /sysutils/ipmitool | |
| parent | 252e28a9c69f62cdbb21a7f663b9e1d344a36a1a (diff) | |
| download | pkgsrc-60549bf838b306ddad18c082d3b63b551645b039.tar.gz | |
Consistently return values from non-void functions.
Diffstat (limited to 'sysutils/ipmitool')
| -rw-r--r-- | sysutils/ipmitool/distinfo | 5 | ||||
| -rw-r--r-- | sysutils/ipmitool/patches/patch-lib_ipmi__hpmfwupg.c | 22 | ||||
| -rw-r--r-- | sysutils/ipmitool/patches/patch-src_plugins_lan_lan.c | 13 | ||||
| -rw-r--r-- | sysutils/ipmitool/patches/patch-src_plugins_lanplus_lanplus.c | 13 |
4 files changed, 52 insertions, 1 deletions
diff --git a/sysutils/ipmitool/distinfo b/sysutils/ipmitool/distinfo index 2767bb04957..cfe99d402d6 100644 --- a/sysutils/ipmitool/distinfo +++ b/sysutils/ipmitool/distinfo @@ -1,7 +1,10 @@ -$NetBSD: distinfo,v 1.5 2011/12/22 19:00:05 drochner Exp $ +$NetBSD: distinfo,v 1.6 2013/03/02 17:56:13 joerg Exp $ SHA1 (ipmitool-1.8.11.tar.gz) = 4cb6ff3736fd3e166abc5303d6373672327a5db1 RMD160 (ipmitool-1.8.11.tar.gz) = 189b2232bcd148bc89c610dfae73c6f12f42fb36 Size (ipmitool-1.8.11.tar.gz) = 769964 bytes SHA1 (patch-ad) = 3941c5ea9286137e58ae6fb62aea6daff390ffa1 SHA1 (patch-ae) = 67828b62b46a30b204dd436681c5ecac39bb29b3 +SHA1 (patch-lib_ipmi__hpmfwupg.c) = e00723a892ad0427d61ecfd6648ff51c338326bc +SHA1 (patch-src_plugins_lan_lan.c) = 9ab88998438f1ce2949af545252dd9e6ba52686c +SHA1 (patch-src_plugins_lanplus_lanplus.c) = d4be54639dd5cf883cf06fa454930e14eda271f6 diff --git a/sysutils/ipmitool/patches/patch-lib_ipmi__hpmfwupg.c b/sysutils/ipmitool/patches/patch-lib_ipmi__hpmfwupg.c new file mode 100644 index 00000000000..d68147f3fce --- /dev/null +++ b/sysutils/ipmitool/patches/patch-lib_ipmi__hpmfwupg.c @@ -0,0 +1,22 @@ +$NetBSD: patch-lib_ipmi__hpmfwupg.c,v 1.1 2013/03/02 17:56:13 joerg Exp $ + +--- lib/ipmi_hpmfwupg.c.orig 2013-03-01 13:04:13.000000000 +0000 ++++ lib/ipmi_hpmfwupg.c +@@ -1233,7 +1233,7 @@ int HpmfwupgTargetCheck(struct ipmi_intf + if (rc != HPMFWUPG_SUCCESS) + { + lprintf(LOG_NOTICE,"Verify whether the Target board is present \n"); +- return; ++ return HPMFWUPG_ERROR; + } + + rc = HpmfwupgGetTargetUpgCapabilities(intf, &targetCapCmd); +@@ -3516,7 +3516,7 @@ int ipmi_hpmfwupg_main(struct ipmi_intf + if ( (argc == 0) || (strcmp(argv[0], "help") == 0) ) + { + HpmfwupgPrintUsage(); +- return; ++ return HPMFWUPG_ERROR; + } + if ( (strcmp(argv[0], "check") == 0) ) + { diff --git a/sysutils/ipmitool/patches/patch-src_plugins_lan_lan.c b/sysutils/ipmitool/patches/patch-src_plugins_lan_lan.c new file mode 100644 index 00000000000..d6b1d9476b4 --- /dev/null +++ b/sysutils/ipmitool/patches/patch-src_plugins_lan_lan.c @@ -0,0 +1,13 @@ +$NetBSD: patch-src_plugins_lan_lan.c,v 1.1 2013/03/02 17:56:13 joerg Exp $ + +--- src/plugins/lan/lan.c.orig 2013-03-01 13:05:13.000000000 +0000 ++++ src/plugins/lan/lan.c +@@ -1071,7 +1071,7 @@ uint8_t * ipmi_lan_build_sol_msg(struct + msg = malloc(len); + if (msg == NULL) { + lprintf(LOG_ERR, "ipmitool: malloc failure"); +- return; ++ return NULL; + } + memset(msg, 0, len); + diff --git a/sysutils/ipmitool/patches/patch-src_plugins_lanplus_lanplus.c b/sysutils/ipmitool/patches/patch-src_plugins_lanplus_lanplus.c new file mode 100644 index 00000000000..9d0d8cff163 --- /dev/null +++ b/sysutils/ipmitool/patches/patch-src_plugins_lanplus_lanplus.c @@ -0,0 +1,13 @@ +$NetBSD: patch-src_plugins_lanplus_lanplus.c,v 1.1 2013/03/02 17:56:13 joerg Exp $ + +--- src/plugins/lanplus/lanplus.c.orig 2013-03-01 13:05:48.000000000 +0000 ++++ src/plugins/lanplus/lanplus.c +@@ -734,7 +734,7 @@ ipmi_lan_poll_recv(struct ipmi_intf * in + ipmi_req_remove_entry(rsp->payload.ipmi_response.rq_seq, + rsp->payload.ipmi_response.cmd); + ipmi_lan_poll_recv(intf); +- return; ++ return NULL; + } + else + { |