deepblue/ipmitool
1
0
Fork 0
mirror of https://github.com/ipmitool/ipmitool.git synced 2026-06-24 06:11:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cleanup all unused-parameter warnings

Browse Source 
Cleanup all unused-parameter warnings.  Each warning was examined to
verify it wasn't simply a case of a build macro difference.

Partially resolves ipmitool/ipmitool#13

Signed-off-by: Patrick Venture <venture@google.com>
This commit is contained in:
Patrick Venture
2018-11-14 08:37:45 -08:00
committed by Alexander Amelkin
parent d6d9c85139
commit 8ea6094118
22 changed files with 170 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/imb/imb.c
View File

@@ -62,7 +62,7 @@ static int ipmi_imb_open(struct ipmi_intf * intf)
printf("Error: no IMB driver found at %s!\n", IPMI_IMB_DEV);
return -1;
}
intf->opened = 1;
intf->manufacturer_id = ipmi_get_oem(intf);
@@ -75,10 +75,10 @@ static void ipmi_imb_close(struct ipmi_intf * intf)
intf->manufacturer_id = IPMI_OEM_UNKNOWN;
}
static struct ipmi_rs * ipmi_imb_send_cmd(struct ipmi_intf * intf, struct ipmi_rq * req)
static struct ipmi_rs * ipmi_imb_send_cmd(struct ipmi_intf *__UNUSED__(intf), struct ipmi_rq *req)
{
IMBPREQUESTDATA imbreq;
static struct ipmi_rs rsp;
static struct ipmi_rs rsp;
int status, i;
unsigned char ccode;

3
src/plugins/imb/imbapi.c
View File

@@ -60,6 +60,7 @@
#include "imbapi.h"
#include <sys/socket.h>
#include <ipmitool/helper.h>
#include <ipmitool/log.h>
#ifdef SCO_UW
@@ -285,7 +286,7 @@ ipmi_close_ia(void)
* it also sets Ntstatus.status.
*/
static BOOL
DeviceIoControl(HANDLE dummey_hDevice, DWORD dwIoControlCode, LPVOID
DeviceIoControl(HANDLE __UNUSED__(dummey_hDevice), DWORD dwIoControlCode, LPVOID
lpvInBuffer, DWORD cbInBuffer, LPVOID lpvOutBuffer,
DWORD cbOutBuffer, LPDWORD lpcbBytesReturned,
LPOVERLAPPED lpoOverlapped)

13
src/plugins/lan/auth.c
View File

@@ -119,14 +119,23 @@ uint8_t * ipmi_auth_md5(struct ipmi_session * s, uint8_t * data, int data_len)
#endif /*HAVE_CRYPTO_MD5*/
}
/*
#ifdef HAVE_CRYPTO_MD2
#define __MD2_ONLY__(x) x
#else
#define __MD2_ONLY__(x) __UNUSED__(x)
#endif
/*
* multi-session authcode generation for MD2
* H(password + session_id + msg + session_seq + password)
*
* Use OpenSSL implementation of MD2 algorithm if found.
* This function is analogous to ipmi_auth_md5
*/
uint8_t * ipmi_auth_md2(struct ipmi_session * s, uint8_t * data, int data_len)
uint8_t * ipmi_auth_md2(
struct ipmi_session *__MD2_ONLY__(s),
uint8_t *__MD2_ONLY__(data),
int __MD2_ONLY__(data_len))
{
#ifdef HAVE_CRYPTO_MD2
MD2_CTX ctx;

11
src/plugins/lan/lan.c
View File

@@ -338,9 +338,9 @@ ipmi_lan_recv_packet(struct ipmi_intf * intf)
* asf.data[f:a]= 0x000000000000
*/
static int
ipmi_handle_pong(struct ipmi_intf * intf, struct ipmi_rs * rsp)
ipmi_handle_pong(struct ipmi_rs *rsp)
{
struct rmcp_pong * pong;
struct rmcp_pong *pong;
if (!rsp)
return -1;
@@ -468,7 +468,7 @@ ipmi_lan_poll_recv(struct ipmi_intf * intf)
switch (rmcp_rsp.class) {
case RMCP_CLASS_ASF:
/* ping response packet */
rv = ipmi_handle_pong(intf, rsp);
rv = ipmi_handle_pong(rsp);
return (rv <= 0) ? NULL : rsp;
case RMCP_CLASS_IPMI:
/* handled by rest of function */
@@ -1310,8 +1310,7 @@ ipmi_lan_send_sol(struct ipmi_intf * intf,
*
*/
static int
check_sol_packet_for_new_data(struct ipmi_intf * intf,
struct ipmi_rs *rsp)
check_sol_packet_for_new_data(struct ipmi_rs *rsp)
{
static uint8_t last_received_sequence_number = 0;
static uint8_t last_received_byte_count = 0;
@@ -1411,7 +1410,7 @@ ipmi_lan_recv_sol(struct ipmi_intf * intf)
* Remembers the data sent, and alters the data to just
* include the new stuff.
*/
check_sol_packet_for_new_data(intf, rsp);
check_sol_packet_for_new_data(rsp);
return rsp;
}

40
src/plugins/lanplus/lanplus.c
View File

@@ -102,15 +102,14 @@ static void getIpmiPayloadWireRep(
uint8_t rq_seq,
uint8_t curr_seq);
static void getSolPayloadWireRep(
struct ipmi_intf * intf,
uint8_t * msg,
struct ipmi_v2_payload * payload);
static void read_open_session_response(struct ipmi_rs * rsp, int offset);
static void read_rakp2_message(struct ipmi_rs * rsp, int offset, uint8_t alg);
static void read_rakp4_message(struct ipmi_rs * rsp, int offset, uint8_t alg);
static void read_session_data(struct ipmi_rs * rsp, int * offset, struct ipmi_session *s);
static void read_session_data_v15(struct ipmi_rs * rsp, int * offset, struct ipmi_session *s);
static void read_session_data_v2x(struct ipmi_rs * rsp, int * offset, struct ipmi_session *s);
static void read_session_data(struct ipmi_rs * rsp, int * offset);
static void read_session_data_v15(struct ipmi_rs * rsp, int * offset);
static void read_session_data_v2x(struct ipmi_rs * rsp, int * offset);
static void read_ipmi_response(struct ipmi_rs * rsp, int * offset);
static void read_sol_packet(struct ipmi_rs * rsp, int * offset);
static struct ipmi_rs * ipmi_lanplus_recv_sol(struct ipmi_intf * intf);
@@ -118,7 +117,6 @@ static struct ipmi_rs * ipmi_lanplus_send_sol(
struct ipmi_intf * intf,
struct ipmi_v2_payload * payload);
static int check_sol_packet_for_new_data(
struct ipmi_intf * intf,
struct ipmi_rs *rsp);
static void ack_sol_packet(
struct ipmi_intf * intf,
@@ -496,7 +494,7 @@ ipmi_lan_recv_packet(struct ipmi_intf * intf)
* asf.data[f:a]= 0x000000000000
*/
static int
ipmi_handle_pong(struct ipmi_intf * intf, struct ipmi_rs * rsp)
ipmi_handle_pong(struct ipmi_rs *rsp)
{
struct rmcp_pong {
struct rmcp_hdr rmcp;
@@ -506,7 +504,7 @@ ipmi_handle_pong(struct ipmi_intf * intf, struct ipmi_rs * rsp)
uint8_t sup_entities;
uint8_t sup_interact;
uint8_t reserved[6];
} * pong;
} *pong;
if (!rsp)
return -1;
@@ -626,7 +624,7 @@ ipmi_lan_poll_single(struct ipmi_intf * intf)
if (rmcp_rsp->class == RMCP_CLASS_ASF) {
/* might be ping response packet */
rv = ipmi_handle_pong(intf, rsp);
rv = ipmi_handle_pong(rsp);
return (rv <= 0) ? NULL : rsp;
}
@@ -656,7 +654,7 @@ ipmi_lan_poll_single(struct ipmi_intf * intf)
* -------------------------------------------------------------------
*/
read_session_data(rsp, &offset, intf->session);
read_session_data(rsp, &offset);
/*
* Skip packets that are not intended for this session
@@ -1132,21 +1130,19 @@ read_rakp4_message(
* param offset [in/out] should point to the beginning of the session when
* this function is called. The offset will be adjusted to
* point to the end of the session when this function exits.
* param session holds our session state
*/
void
read_session_data(
struct ipmi_rs * rsp,
int * offset,
struct ipmi_session * s)
int * offset)
{
/* We expect to read different stuff depending on the authtype */
rsp->session.authtype = rsp->data[*offset];
if (rsp->session.authtype == IPMI_SESSION_AUTHTYPE_RMCP_PLUS)
read_session_data_v2x(rsp, offset, s);
read_session_data_v2x(rsp, offset);
else
read_session_data_v15(rsp, offset, s);
read_session_data_v15(rsp, offset);
}
@@ -1172,8 +1168,7 @@ read_session_data(
void
read_session_data_v2x(
struct ipmi_rs * rsp,
int * offset,
struct ipmi_session * s)
int * offset)
{
rsp->session.authtype = rsp->data[(*offset)++];
@@ -1201,7 +1196,7 @@ read_session_data_v2x(
/*
* read_session_data_v15
*
* Initialize the ipmi_rsp from the session header of the packet.
* Initialize the ipmi_rsp from the session header of the packet.
*
* The offset should point the first byte of the the IPMI session when this
* function is called. When this function exits, the offset will point to
@@ -1216,8 +1211,7 @@ read_session_data_v2x(
*/
void read_session_data_v15(
struct ipmi_rs * rsp,
int * offset,
struct ipmi_session * s)
int * offset)
{
/* All v15 messages are IPMI messages */
rsp->session.payloadtype = IPMI_PAYLOAD_TYPE_IPMI;
@@ -1481,7 +1475,6 @@ void getIpmiPayloadWireRep(
* param payload [in] holds the v2 payload with our SOL data
*/
void getSolPayloadWireRep(
struct ipmi_intf * intf, /* in out */
uint8_t * msg, /* output */
struct ipmi_v2_payload * payload) /* input */
{
@@ -1687,7 +1680,7 @@ ipmi_lanplus_build_v2x_msg(
break;
case IPMI_PAYLOAD_TYPE_SOL:
getSolPayloadWireRep(intf,
getSolPayloadWireRep(
msg + IPMI_LANPLUS_OFFSET_PAYLOAD,
payload);
@@ -2528,7 +2521,6 @@ ipmi_lanplus_send_sol(
*/
static int
check_sol_packet_for_new_data(
struct ipmi_intf * intf,
struct ipmi_rs *rsp)
{
static uint8_t last_received_sequence_number = 0;
@@ -2644,7 +2636,7 @@ ipmi_lanplus_recv_sol(struct ipmi_intf * intf)
* Remembers the data sent, and alters the data to just
* include the new stuff.
*/
check_sol_packet_for_new_data(intf, rsp);
check_sol_packet_for_new_data(rsp);
}
return rsp;
}
@@ -3700,7 +3692,7 @@ ipmi_lanplus_keepalive(struct ipmi_intf * intf)
/* rsp was SOL data instead of our answer */
/* since it didn't go through the sol recv, do sol recv stuff here */
ack_sol_packet(intf, rsp);
check_sol_packet_for_new_data(intf, rsp);
check_sol_packet_for_new_data(rsp);
if (rsp->data_len)
intf->session->sol_data.sol_input_handler(rsp);
rsp = ipmi_lan_poll_recv(intf);

4
src/plugins/serial/serial_basic.c
View File

@@ -816,12 +816,14 @@ serial_bm_wait_response(struct ipmi_intf * intf,
/*
* Get message from receive message queue
*
* Note: kept max_len in case later use.
*/
static int
serial_bm_get_message(struct ipmi_intf * intf,
struct serial_bm_request_ctx * req_ctx,
struct serial_bm_recv_ctx * read_ctx,
uint8_t * msg, size_t max_len)
uint8_t * msg, size_t __UNUSED__(max_len))
{
uint8_t data[SERIAL_BM_MAX_MSG_SIZE];
struct serial_bm_request_ctx tmp_ctx;

4
src/plugins/serial/serial_terminal.c
View File

@@ -714,11 +714,13 @@ serial_term_wait_response(struct ipmi_intf * intf,
/*
* Get message from receive message queue
*
* Note: Kept max_len in case it's useful later.
*/
static int
serial_term_get_message(struct ipmi_intf * intf,
struct serial_term_request_ctx * req_ctx,
uint8_t * msg, size_t max_len)
uint8_t * msg, size_t __UNUSED__(max_len))
{
uint8_t data[IPMI_SERIAL_MAX_RESPONSE];
struct serial_term_request_ctx tmp_ctx;