diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2014-08-09 11:42:23 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2014-08-09 11:42:23 +0200 |
| commit | 2c088f61bf4d73964e4d73f09412ec74a52e5518 (patch) | |
| tree | 63f521249dbc05c69c3b05e757882232714a2d8b /lib/lanplus | |
| parent | 9d9bae11084226b2e1473243d546b149cdf9e5c9 (diff) | |
changes to version 2.9.4
Diffstat (limited to 'lib/lanplus')
| -rw-r--r-- | lib/lanplus/helper.c | 7 | ||||
| -rw-r--r-- | lib/lanplus/lanplus.c | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lib/lanplus/helper.c b/lib/lanplus/helper.c index 51e39c8..38ce28f 100644 --- a/lib/lanplus/helper.c +++ b/lib/lanplus/helper.c @@ -72,8 +72,9 @@ extern int verbose; -#ifdef MOVED -/* moved to subs.c */ +/* By default, moved to util/subs.c for more global access. + * Define LANHELPER to define these here for ipmi_lanplus.a */ +#ifdef LANHELPER uint32_t buf2long(uint8_t * buf) { return (uint32_t)(buf[3] << 24 | buf[2] << 16 | buf[1] << 8 | buf[0]); @@ -102,7 +103,7 @@ const char * buf2str(uint8_t * buf, int len) return (const char *)str; } -/* moved to util/ipmilanplus.c for better control */ +/* moved to util/subs.c for better control (e.g. ipmilanplus.c) */ #ifdef STATIC extern FILE *fplog; /*see util/ipmicmd.c ++++*/ #endif diff --git a/lib/lanplus/lanplus.c b/lib/lanplus/lanplus.c index 40d3ab4..b695837 100644 --- a/lib/lanplus/lanplus.c +++ b/lib/lanplus/lanplus.c @@ -904,7 +904,7 @@ ipmi_lan_poll_recv(struct ipmi_intf * intf) if (rsp->data_len && rsp->payload.ipmi_response.cmd== 0x34) { - memcpy(rsp->data, &rsp->data[offset], + memmove(rsp->data, &rsp->data[offset], (rsp->data_len-offset)); printbuf( &rsp->data[offset], (rsp->data_len-offset), |