deepblue/ipmitool
1
0
Fork 0
mirror of https://github.com/ipmitool/ipmitool.git synced 2025-05-10 18:47:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

open: fix whitespace

Browse Source 
Apply whitespace fixes via clang-format-6.0 to src/plugins/open/open.c
to cleanup spaces and fixup line lengths, etc.

Signed-off-by: Patrick Venture <venture@google.com>
This commit is contained in:
Patrick Venture 2018-11-26 10:26:25 -08:00 committed by Alexander Amelkin
parent 08348f1b72
commit 3bfa1da201
1 changed files with 180 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/plugins/open/open.c
View File

@ -88,7 +88,8 @@
extern int verbose; extern int verbose;
static int static
int
ipmi_openipmi_open(struct ipmi_intf *intf) ipmi_openipmi_open(struct ipmi_intf *intf)
{ {
char ipmi_dev[16]; char ipmi_dev[16];
@ -132,14 +133,15 @@ ipmi_openipmi_open(struct ipmi_intf * intf)
lperror(LOG_ERR, "Could not set IPMB address"); lperror(LOG_ERR, "Could not set IPMB address");
return -1; return -1;
} }
lprintf(LOG_DEBUG, "Set IPMB address to 0x%x", lprintf(LOG_DEBUG, "Set IPMB address to 0x%x", intf->my_addr);
intf->my_addr );
} }
intf->manufacturer_id = ipmi_get_oem(intf); intf->manufacturer_id = ipmi_get_oem(intf);
return intf->fd; return intf->fd;
} }
static int
static
int
ipmi_openipmi_set_my_addr(struct ipmi_intf *intf, uint8_t addr) ipmi_openipmi_set_my_addr(struct ipmi_intf *intf, uint8_t addr)
{ {
unsigned int a = addr; unsigned int a = addr;
@ -151,7 +153,8 @@ ipmi_openipmi_set_my_addr(struct ipmi_intf *intf, uint8_t addr)
return 0; return 0;
} }
static void static
void
ipmi_openipmi_close(struct ipmi_intf *intf) ipmi_openipmi_close(struct ipmi_intf *intf)
{ {
if (intf->fd >= 0) { if (intf->fd >= 0) {
@ -163,7 +166,8 @@ ipmi_openipmi_close(struct ipmi_intf * intf)
intf->manufacturer_id = IPMI_OEM_UNKNOWN; intf->manufacturer_id = IPMI_OEM_UNKNOWN;
} }
static struct ipmi_rs * static
struct ipmi_rs *
ipmi_openipmi_send_cmd(struct ipmi_intf *intf, struct ipmi_rq *req) ipmi_openipmi_send_cmd(struct ipmi_intf *intf, struct ipmi_rq *req)
{ {
struct ipmi_recv recv; struct ipmi_recv recv;
@ -185,7 +189,6 @@ ipmi_openipmi_send_cmd(struct ipmi_intf * intf, struct ipmi_rq * req)
int data_len = 0; int data_len = 0;
int retval = 0; int retval = 0;
if (!intf || !req) if (!intf || !req)
return NULL; return NULL;
@ -199,11 +202,10 @@ ipmi_openipmi_send_cmd(struct ipmi_intf * intf, struct ipmi_rq * req)
fprintf(stderr, "OpenIPMI Request Message Header:\n"); fprintf(stderr, "OpenIPMI Request Message Header:\n");
fprintf(stderr, " netfn = 0x%x\n", req->msg.netfn); fprintf(stderr, " netfn = 0x%x\n", req->msg.netfn);
fprintf(stderr, " cmd = 0x%x\n", req->msg.cmd); fprintf(stderr, " cmd = 0x%x\n", req->msg.cmd);
printbuf(req->msg.data, req->msg.data_len, "OpenIPMI Request Message Data"); printbuf(req->msg.data, req->msg.data_len,
"OpenIPMI Request Message Data");
} }
/* /*
* setup and send message * setup and send message
*/ */
@ -211,26 +213,31 @@ ipmi_openipmi_send_cmd(struct ipmi_intf * intf, struct ipmi_rq * req)
memset(&_req, 0, sizeof(struct ipmi_req)); memset(&_req, 0, sizeof(struct ipmi_req));
if (intf->target_addr != 0 && if (intf->target_addr != 0 &&
intf->target_addr != intf->my_addr) { intf->target_addr != intf->my_addr)
{
/* use IPMB address if needed */ /* use IPMB address if needed */
ipmb_addr.slave_addr = intf->target_addr; ipmb_addr.slave_addr = intf->target_addr;
ipmb_addr.lun = req->msg.lun; ipmb_addr.lun = req->msg.lun;
lprintf(LOG_DEBUG, "Sending request 0x%x to " lprintf(LOG_DEBUG,
"Sending request 0x%x to "
"IPMB target @ 0x%x:0x%x (from 0x%x)", "IPMB target @ 0x%x:0x%x (from 0x%x)",
req->msg.cmd, req->msg.cmd, intf->target_addr, intf->target_channel,
intf->target_addr,intf->target_channel, intf->my_addr); intf->my_addr);
if(intf->transit_addr != 0 && intf->transit_addr != intf->my_addr) { if (intf->transit_addr != 0 &&
intf->transit_addr != intf->my_addr)
{
uint8_t index = 0; uint8_t index = 0;
lprintf(LOG_DEBUG, "Encapsulating data sent to " lprintf(LOG_DEBUG,
"end target [0x%02x,0x%02x] using transit [0x%02x,0x%02x] from 0x%x ", "Encapsulating data sent to "
"end target [0x%02x,0x%02x] using "
"transit [0x%02x,0x%02x] from 0x%x ",
(0x40 | intf->target_channel), (0x40 | intf->target_channel),
intf->target_addr, intf->target_addr,
intf->transit_channel, intf->transit_channel,
intf->transit_addr, intf->transit_addr,
intf->my_addr intf->my_addr);
);
/* Convert Message to 'Send Message' */ /* Convert Message to 'Send Message' */
/* Supplied req : req , internal req : _req */ /* Supplied req : req , internal req : _req */
@ -286,8 +293,8 @@ ipmi_openipmi_send_cmd(struct ipmi_intf * intf, struct ipmi_rq * req)
_req.addr_len = sizeof(ipmb_addr); _req.addr_len = sizeof(ipmb_addr);
} else { } else {
/* otherwise use system interface */ /* otherwise use system interface */
lprintf(LOG_DEBUG+2, "Sending request 0x%x to " lprintf(LOG_DEBUG + 2, "Sending request 0x%x to System Interface",
"System Interface", req->msg.cmd); req->msg.cmd);
bmc_addr.lun = req->msg.lun; bmc_addr.lun = req->msg.lun;
_req.addr = (unsigned char *)&bmc_addr; _req.addr = (unsigned char *)&bmc_addr;
_req.addr_len = sizeof(bmc_addr); _req.addr_len = sizeof(bmc_addr);
@ -394,8 +401,10 @@ ipmi_openipmi_send_cmd(struct ipmi_intf * intf, struct ipmi_rq * req)
if (intf->transit_addr != 0 && intf->transit_addr != intf->my_addr) { if (intf->transit_addr != 0 && intf->transit_addr != intf->my_addr) {
/* ipmb_addr.transit_slave_addr = intf->transit_addr; */ /* ipmb_addr.transit_slave_addr = intf->transit_addr; */
lprintf(LOG_DEBUG, "Decapsulating data received from transit " lprintf(LOG_DEBUG,
"IPMB target @ 0x%x", intf->transit_addr); "Decapsulating data received from transit "
"IPMB target @ 0x%x",
intf->transit_addr);
/* comp code */ /* comp code */
/* Check data */ /* Check data */
@ -404,7 +413,8 @@ ipmi_openipmi_send_cmd(struct ipmi_intf * intf, struct ipmi_rq * req)
recv.msg.netfn = recv.msg.data[2] >> 2; recv.msg.netfn = recv.msg.data[2] >> 2;
recv.msg.cmd = recv.msg.data[6]; recv.msg.cmd = recv.msg.data[6];
recv.msg.data = memmove(recv.msg.data ,recv.msg.data+7 , recv.msg.data_len - 7); recv.msg.data = memmove(recv.msg.data, recv.msg.data + 7,
recv.msg.data_len - 7);
recv.msg.data_len -= 8; recv.msg.data_len -= 8;
if (verbose > 4) { if (verbose > 4) {
@ -438,7 +448,8 @@ ipmi_openipmi_send_cmd(struct ipmi_intf * intf, struct ipmi_rq * req)
return &rsp; return &rsp;
} }
int ipmi_openipmi_setup(struct ipmi_intf * intf) int
ipmi_openipmi_setup(struct ipmi_intf *intf)
{ {
/* set default payload size */ /* set default payload size */
intf->max_request_data_size = IPMI_OPENIPMI_MAX_RQ_DATA_SIZE; intf->max_request_data_size = IPMI_OPENIPMI_MAX_RQ_DATA_SIZE;