From 2c088f61bf4d73964e4d73f09412ec74a52e5518 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 9 Aug 2014 11:42:23 +0200 Subject: changes to version 2.9.4 --- lib/lanplus/helper.c | 7 ++++--- lib/lanplus/lanplus.c | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'lib') 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), -- cgit v1.2.3