From: Jason Gunthorpe <jgg@xxxxxxxxxxxx>
Fixes the compiler warning
warning: no previous prototype for ‘dump_multicast_tables’ [-Wmissing-prototypes]
Signed-off-by: Jason Gunthorpe <jgg@xxxxxxxxxxxx>
---
libibnetdisc/test/testleaks.c | 2 +-
src/dump_fts.c | 26 +++++++++++-----------
src/ibdiag_common.c | 14 ++++++------
src/iblinkinfo.c | 20 +++++++++--------
src/ibnetdiscover.c | 41 ++++++++++++++++++-----------------
src/ibping.c | 2 +-
src/ibqueryerrors.c | 8 +++----
src/ibroute.c | 17 ++++++++-------
src/ibsendtrap.c | 2 +-
src/ibsysstat.c | 2 +-
src/mcm_rereg_test.c | 3 ++-
src/perfquery.c | 2 +-
src/smpdump.c | 6 ++---
13 files changed, 75 insertions(+), 70 deletions(-)
diff --git a/libibnetdisc/test/testleaks.c b/libibnetdisc/test/testleaks.c
index dd216b134d6f41..84c2b76558c328 100644
--- a/libibnetdisc/test/testleaks.c
+++ b/libibnetdisc/test/testleaks.c
@@ -54,7 +54,7 @@
const char *argv0 = "iblinkinfotest";
static FILE *f;
-void usage(void)
+static void usage(void)
{
fprintf(stderr,
"Usage: %s [-hclp -D <direct route> -C <ca_name> -P <ca_port>]\n"
diff --git a/src/dump_fts.c b/src/dump_fts.c
index 20abd241cc1576..998383aa470453 100644
--- a/src/dump_fts.c
+++ b/src/dump_fts.c
@@ -65,8 +65,8 @@ static nn_map_t *node_name_map = NULL;
#define IB_MLIDS_IN_BLOCK (IB_SMP_DATA_SIZE/2)
-int dump_mlid(char *str, int strlen, unsigned mlid, unsigned nports,
- uint16_t mft[16][IB_MLIDS_IN_BLOCK])
+static int dump_mlid(char *str, int strlen, unsigned mlid, unsigned nports,
+ uint16_t mft[16][IB_MLIDS_IN_BLOCK])
{
uint16_t mask;
unsigned i, chunk, bit, nonzero = 0;
@@ -110,8 +110,8 @@ int dump_mlid(char *str, int strlen, unsigned mlid, unsigned nports,
uint16_t mft[16][IB_MLIDS_IN_BLOCK] = { { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0}, { 0 }, { 0 } };
-void dump_multicast_tables(ibnd_node_t * node, unsigned startlid,
- unsigned endlid, struct ibmad_port * mad_port)
+static void dump_multicast_tables(ibnd_node_t *node, unsigned startlid,
+ unsigned endlid, struct ibmad_port *mad_port)
{
ib_portid_t *portid = &node->path_portid;
char nd[IB_SMP_DATA_SIZE] = { 0 };
@@ -225,10 +225,9 @@ void dump_multicast_tables(ibnd_node_t * node, unsigned startlid,
free(mapnd);
}
-int dump_lid(char *str, int str_len, int lid, int valid,
- ibnd_fabric_t *fabric,
- int * last_port_lid, int * base_port_lid,
- uint64_t * portguid)
+static int dump_lid(char *str, int str_len, int lid, int valid,
+ ibnd_fabric_t *fabric, int *last_port_lid,
+ int *base_port_lid, uint64_t *portguid)
{
char nd[IB_SMP_DATA_SIZE] = { 0 };
@@ -302,8 +301,9 @@ int dump_lid(char *str, int str_len, int lid, int valid,
return rc;
}
-void dump_unicast_tables(ibnd_node_t * node, int startlid, int endlid,
- struct ibmad_port *mad_port, ibnd_fabric_t *fabric)
+static void dump_unicast_tables(ibnd_node_t *node, int startlid, int endlid,
+ struct ibmad_port *mad_port,
+ ibnd_fabric_t *fabric)
{
ib_portid_t * portid = &node->path_portid;
char lft[IB_SMP_DATA_SIZE] = { 0 };
@@ -379,8 +379,8 @@ void dump_unicast_tables(ibnd_node_t * node, int startlid, int endlid,
free(mapnd);
}
-void dump_node(ibnd_node_t *node, struct ibmad_port *mad_port,
- ibnd_fabric_t *fabric)
+static void dump_node(ibnd_node_t *node, struct ibmad_port *mad_port,
+ ibnd_fabric_t *fabric)
{
if (multicast)
dump_multicast_tables(node, startlid, endlid, mad_port);
@@ -389,7 +389,7 @@ void dump_node(ibnd_node_t *node, struct ibmad_port *mad_port,
mad_port, fabric);
}
-void process_switch(ibnd_node_t * node, void *fabric)
+static void process_switch(ibnd_node_t *node, void *fabric)
{
dump_node(node, srcport, (ibnd_fabric_t *)fabric);
}
diff --git a/src/ibdiag_common.c b/src/ibdiag_common.c
index cfc7b926b61d94..867b5d0c5693e1 100644
--- a/src/ibdiag_common.c
+++ b/src/ibdiag_common.c
@@ -118,7 +118,7 @@ static inline int val_str_true(const char *val_str)
(strncmp(val_str, "true", strlen("true")) == 0));
}
-void read_ibdiag_config(const char *file)
+static void read_ibdiag_config(const char *file)
{
char buf[1024];
FILE *config_fd = NULL;
@@ -633,9 +633,9 @@ int resolve_self(char *ca_name, uint8_t ca_port, ib_portid_t *portid,
return 0;
}
-int resolve_gid(char *ca_name, uint8_t ca_port, ib_portid_t * portid,
- ibmad_gid_t gid, ib_portid_t * sm_id,
- const struct ibmad_port *srcport)
+static int resolve_gid(char *ca_name, uint8_t ca_port, ib_portid_t *portid,
+ ibmad_gid_t gid, ib_portid_t *sm_id,
+ const struct ibmad_port *srcport)
{
ib_portid_t sm_portid;
char buf[IB_SA_DATA_SIZE] = { 0 };
@@ -653,9 +653,9 @@ int resolve_gid(char *ca_name, uint8_t ca_port, ib_portid_t * portid,
return 0;
}
-int resolve_guid(char *ca_name, uint8_t ca_port, ib_portid_t *portid,
- uint64_t *guid, ib_portid_t *sm_id,
- const struct ibmad_port *srcport)
+static int resolve_guid(char *ca_name, uint8_t ca_port, ib_portid_t *portid,
+ uint64_t *guid, ib_portid_t *sm_id,
+ const struct ibmad_port *srcport)
{
ib_portid_t sm_portid;
uint8_t buf[IB_SA_DATA_SIZE] = { 0 };
diff --git a/src/iblinkinfo.c b/src/iblinkinfo.c
index 0252d5bbd0d9e9..9542a0ea51c3ca 100644
--- a/src/iblinkinfo.c
+++ b/src/iblinkinfo.c
@@ -80,7 +80,7 @@ static int add_sw_settings = 0;
static int only_flag = 0;
static int only_type = 0;
-int filterdownport_check(ibnd_node_t * node, ibnd_port_t * port)
+static int filterdownport_check(ibnd_node_t *node, ibnd_port_t *port)
{
ibnd_node_t *fsw;
ibnd_port_t *fport;
@@ -104,7 +104,8 @@ int filterdownport_check(ibnd_node_t * node, ibnd_port_t * port)
return (fistate == IB_LINK_DOWN) ? 1 : 0;
}
-void print_port(ibnd_node_t *node, ibnd_port_t *port, const char *out_prefix)
+static void print_port(ibnd_node_t *node, ibnd_port_t *port,
+ const char *out_prefix)
{
char width[64], speed[64], state[64], physstate[64];
char remote_guid_str[256];
@@ -271,7 +272,7 @@ static inline const char *nodetype_str(ibnd_node_t * node)
return "??";
}
-void print_node_header(ibnd_node_t *node, int *out_header_flag,
+static void print_node_header(ibnd_node_t *node, int *out_header_flag,
const char *out_prefix)
{
uint64_t guid = 0;
@@ -298,7 +299,7 @@ void print_node_header(ibnd_node_t *node, int *out_header_flag,
}
}
-void print_node(ibnd_node_t * node, void *user_data)
+static void print_node(ibnd_node_t *node, void *user_data)
{
int i = 0;
int head_print = 0;
@@ -325,8 +326,9 @@ struct iter_diff_data {
const char *fabric2_prefix;
};
-void diff_node_ports(ibnd_node_t * fabric1_node, ibnd_node_t * fabric2_node,
- int *head_print, struct iter_diff_data *data)
+static void diff_node_ports(ibnd_node_t *fabric1_node,
+ ibnd_node_t *fabric2_node, int *head_print,
+ struct iter_diff_data *data)
{
int i = 0;
@@ -407,7 +409,7 @@ void diff_node_ports(ibnd_node_t * fabric1_node, ibnd_node_t * fabric2_node,
}
}
-void diff_node_iter(ibnd_node_t * fabric1_node, void *iter_user_data)
+static void diff_node_iter(ibnd_node_t *fabric1_node, void *iter_user_data)
{
struct iter_diff_data *data = iter_user_data;
ibnd_node_t *fabric2_node;
@@ -453,8 +455,8 @@ void diff_node_iter(ibnd_node_t * fabric1_node, void *iter_user_data)
}
}
-int diff_node(ibnd_node_t * node, ibnd_fabric_t * orig_fabric,
- ibnd_fabric_t * new_fabric)
+static int diff_node(ibnd_node_t *node, ibnd_fabric_t *orig_fabric,
+ ibnd_fabric_t *new_fabric)
{
struct iter_diff_data iter_diff_data;
diff --git a/src/ibnetdiscover.c b/src/ibnetdiscover.c
index f3bfa5d353858c..053f3bd70563a7 100644
--- a/src/ibnetdiscover.c
+++ b/src/ibnetdiscover.c
@@ -84,7 +84,7 @@ static int full_info;
* Define our own conversion functions to maintain compatibility with the old
* ibnetdiscover which did not use the ibmad conversion functions.
*/
-const char *dump_linkspeed_compat(uint32_t speed)
+static const char *dump_linkspeed_compat(uint32_t speed)
{
switch (speed) {
case 1:
@@ -100,8 +100,8 @@ const char *dump_linkspeed_compat(uint32_t speed)
return ("???");
}
-const char *dump_linkspeedext_compat(uint32_t espeed, uint32_t speed,
- uint32_t fdr10)
+static const char *dump_linkspeedext_compat(uint32_t espeed, uint32_t speed,
+ uint32_t fdr10)
{
switch (espeed) {
case 0:
@@ -123,7 +123,7 @@ const char *dump_linkspeedext_compat(uint32_t espeed, uint32_t speed,
return ("???");
}
-const char *dump_linkwidth_compat(uint32_t width)
+static const char *dump_linkwidth_compat(uint32_t width)
{
switch (width) {
case 1:
@@ -158,7 +158,7 @@ static inline const char *ports_nt_str_compat(ibnd_node_t * node)
return "??";
}
-char *node_name(ibnd_node_t * node)
+static char *node_name(ibnd_node_t * node)
{
static char buf[256];
@@ -181,9 +181,9 @@ char *node_name(ibnd_node_t * node)
return buf;
}
-void list_node(ibnd_node_t * node, void *user_data)
+static void list_node(ibnd_node_t *node, void *user_data)
{
- char *node_type;
+ const char *node_type;
char *nodename = remap_node_name(node_name_map, node->guid,
node->nodedesc);
@@ -211,7 +211,7 @@ void list_node(ibnd_node_t * node, void *user_data)
free(nodename);
}
-void list_nodes(ibnd_fabric_t * fabric, int list)
+static void list_nodes(ibnd_fabric_t *fabric, int list)
{
if (list & LIST_CA_NODE)
ibnd_iter_nodes_type(fabric, list_node, IB_NODE_CA, NULL);
@@ -221,7 +221,8 @@ void list_nodes(ibnd_fabric_t * fabric, int list)
ibnd_iter_nodes_type(fabric, list_node, IB_NODE_ROUTER, NULL);
}
-void out_ids(ibnd_node_t *node, int group, char *chname, const char *out_prefix)
+static void out_ids(ibnd_node_t *node, int group, char *chname,
+ const char *out_prefix)
{
uint64_t sysimgguid =
mad_get_field64(node->info, 0, IB_NODE_SYSTEM_GUID_F);
@@ -247,7 +248,7 @@ void out_ids(ibnd_node_t *node, int group, char *chname, const char *out_prefix)
fprintf(f, "\n");
}
-uint64_t out_chassis(ibnd_fabric_t * fabric, unsigned char chassisnum)
+static uint64_t out_chassis(ibnd_fabric_t *fabric, unsigned char chassisnum)
{
uint64_t guid;
@@ -259,7 +260,7 @@ uint64_t out_chassis(ibnd_fabric_t * fabric, unsigned char chassisnum)
return guid;
}
-void out_switch_detail(ibnd_node_t * node, const char *sw_prefix)
+static void out_switch_detail(ibnd_node_t *node, const char *sw_prefix)
{
char *nodename = NULL;
@@ -273,8 +274,8 @@ void out_switch_detail(ibnd_node_t * node, const char *sw_prefix)
free(nodename);
}
-void out_switch(ibnd_node_t *node, int group, char *chname,
- const char *id_prefix, const char *sw_prefix)
+static void out_switch(ibnd_node_t *node, int group, char *chname,
+ const char *id_prefix, const char *sw_prefix)
{
const char *str;
char str2[256];
@@ -299,7 +300,7 @@ void out_switch(ibnd_node_t *node, int group, char *chname,
fprintf(f, "\n");
}
-void out_ca_detail(ibnd_node_t *node, const char *ca_prefix)
+static void out_ca_detail(ibnd_node_t *node, const char *ca_prefix)
{
const char *node_type;
@@ -320,8 +321,8 @@ void out_ca_detail(ibnd_node_t *node, const char *ca_prefix)
clean_nodedesc(node->nodedesc));
}
-void out_ca(ibnd_node_t *node, int group, char *chname, const char *id_prefix,
- const char *ca_prefix)
+static void out_ca(ibnd_node_t *node, int group, char *chname,
+ const char *id_prefix, const char *ca_prefix)
{
const char *node_type;
@@ -429,7 +430,7 @@ static void out_switch_port(ibnd_port_t *port, int group,
free(rem_nodename);
}
-void out_ca_port(ibnd_port_t *port, int group, const char *out_prefix)
+static void out_ca_port(ibnd_port_t *port, int group, const char *out_prefix)
{
char *str = NULL;
char *rem_nodename = NULL;
@@ -545,7 +546,7 @@ static void router_iter_func(ibnd_node_t * node, void *iter_user_data)
}
}
-int dump_topology(int group, ibnd_fabric_t * fabric)
+static int dump_topology(int group, ibnd_fabric_t *fabric)
{
ibnd_node_t *node;
ibnd_port_t *port;
@@ -687,7 +688,7 @@ int dump_topology(int group, ibnd_fabric_t * fabric)
return i;
}
-void dump_ports_report(ibnd_node_t * node, void *user_data)
+static void dump_ports_report(ibnd_node_t *node, void *user_data)
{
int p = 0;
ibnd_port_t *port = NULL;
@@ -968,7 +969,7 @@ static int diff_common(ibnd_fabric_t *orig_fabric, ibnd_fabric_t *new_fabric,
return 0;
}
-int diff(ibnd_fabric_t * orig_fabric, ibnd_fabric_t * new_fabric)
+static int diff(ibnd_fabric_t *orig_fabric, ibnd_fabric_t *new_fabric)
{
if (diffcheck_flags & DIFF_FLAG_SWITCH)
diff_common(orig_fabric, new_fabric, IB_NODE_SWITCH,
diff --git a/src/ibping.c b/src/ibping.c
index b87f24d8108ded..ebcb581550f4f1 100644
--- a/src/ibping.c
+++ b/src/ibping.c
@@ -142,7 +142,7 @@ static uint64_t minrtt = ~0ull, maxrtt, total_rtt;
static uint64_t start, total_time, replied, lost, ntrans;
static ib_portid_t portid = { 0 };
-void report(int sig)
+static void report(int sig)
{
total_time = cl_get_time_stamp() - start;
diff --git a/src/ibqueryerrors.c b/src/ibqueryerrors.c
index 4d5bc7c21b7498..397127e686db63 100644
--- a/src/ibqueryerrors.c
+++ b/src/ibqueryerrors.c
@@ -673,9 +673,9 @@ static int print_errors(ib_portid_t * portid, uint16_t cap_mask, uint32_t cap_ma
header_printed, pc_ext, cap_mask, cap_mask2));
}
-uint8_t *reset_pc_ext(void *rcvbuf, ib_portid_t * dest,
- int port, unsigned mask, unsigned timeout,
- const struct ibmad_port * srcport)
+static uint8_t *reset_pc_ext(void *rcvbuf, ib_portid_t *dest, int port,
+ unsigned mask, unsigned timeout,
+ const struct ibmad_port *srcport)
{
ib_rpc_t rpc = { 0 };
int lid = dest->lid;
@@ -770,7 +770,7 @@ static void clear_port(ib_portid_t * portid, uint16_t cap_mask, uint32_t cap_mas
}
}
-void print_node(ibnd_node_t * node, void *user_data)
+static void print_node(ibnd_node_t *node, void *user_data)
{
int header_printed = 0;
int p = 0;
diff --git a/src/ibroute.c b/src/ibroute.c
index 111524ae97299d..76dab8940c49d4 100644
--- a/src/ibroute.c
+++ b/src/ibroute.c
@@ -59,8 +59,8 @@ static nn_map_t *node_name_map = NULL;
/*******************************************/
-const char *check_switch(ib_portid_t *portid, unsigned int *nports,
- uint64_t *guid, uint8_t *sw, char *nd)
+static const char *check_switch(ib_portid_t *portid, unsigned int *nports,
+ uint64_t *guid, uint8_t *sw, char *nd)
{
uint8_t ni[IB_SMP_DATA_SIZE] = { 0 };
int type;
@@ -90,8 +90,8 @@ const char *check_switch(ib_portid_t *portid, unsigned int *nports,
#define IB_MLIDS_IN_BLOCK (IB_SMP_DATA_SIZE/2)
-int dump_mlid(char *str, int strlen, unsigned mlid, unsigned nports,
- uint16_t mft[16][IB_MLIDS_IN_BLOCK])
+static int dump_mlid(char *str, int strlen, unsigned mlid, unsigned nports,
+ uint16_t mft[16][IB_MLIDS_IN_BLOCK])
{
uint16_t mask;
unsigned i, chunk, bit, nonzero = 0;
@@ -135,8 +135,8 @@ int dump_mlid(char *str, int strlen, unsigned mlid, unsigned nports,
uint16_t mft[16][IB_MLIDS_IN_BLOCK] = { { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0}, { 0 }, { 0 } };
-const char *dump_multicast_tables(ib_portid_t *portid, unsigned startlid,
- unsigned endlid)
+static const char *dump_multicast_tables(ib_portid_t *portid, unsigned startlid,
+ unsigned endlid)
{
char nd[IB_SMP_DATA_SIZE] = { 0 };
uint8_t sw[IB_SMP_DATA_SIZE] = { 0 };
@@ -247,7 +247,7 @@ const char *dump_multicast_tables(ib_portid_t *portid, unsigned startlid,
return 0;
}
-int dump_lid(char *str, int strlen, int lid, int valid)
+static int dump_lid(char *str, int strlen, int lid, int valid)
{
char nd[IB_SMP_DATA_SIZE] = { 0 };
uint8_t ni[IB_SMP_DATA_SIZE] = { 0 };
@@ -322,7 +322,8 @@ int dump_lid(char *str, int strlen, int lid, int valid)
return rc;
}
-const char *dump_unicast_tables(ib_portid_t *portid, int startlid, int endlid)
+static const char *dump_unicast_tables(ib_portid_t *portid, int startlid,
+ int endlid)
{
char lft[IB_SMP_DATA_SIZE] = { 0 };
char nd[IB_SMP_DATA_SIZE] = { 0 };
diff --git a/src/ibsendtrap.c b/src/ibsendtrap.c
index d892c97fc4fc40..1d7725ee71ad0a 100644
--- a/src/ibsendtrap.c
+++ b/src/ibsendtrap.c
@@ -224,7 +224,7 @@ static const trap_def_t traps[] = {
{NULL, NULL}
};
-int process_send_trap(const char *trap_name)
+static int process_send_trap(const char *trap_name)
{
int i;
diff --git a/src/ibsysstat.c b/src/ibsysstat.c
index ec3b86b2fefb4a..d49eafc63e4b23 100644
--- a/src/ibsysstat.c
+++ b/src/ibsysstat.c
@@ -257,7 +257,7 @@ static char *ibsystat(ib_portid_t * portid, int attr)
return 0;
}
-int build_cpuinfo(void)
+static int build_cpuinfo(void)
{
char line[1024] = { 0 }, *s, *e;
FILE *f;
diff --git a/src/mcm_rereg_test.c b/src/mcm_rereg_test.c
index 197a7877d2956a..183ebd5bcccd0d 100644
--- a/src/mcm_rereg_test.c
+++ b/src/mcm_rereg_test.c
@@ -63,7 +63,8 @@ static ibmad_gid_t mgid_ipoib = {
struct ibmad_port *srcport;
-uint64_t build_mcm_rec(uint8_t * data, ibmad_gid_t mgid, ibmad_gid_t port_gid)
+static uint64_t build_mcm_rec(uint8_t *data, ibmad_gid_t mgid,
+ ibmad_gid_t port_gid)
{
memset(data, 0, IB_SA_DATA_SIZE);
mad_set_array(data, 0, IB_SA_MCM_MGID_F, mgid);
diff --git a/src/perfquery.c b/src/perfquery.c
index 19d427386e119c..ee3e10b4c9a991 100644
--- a/src/perfquery.c
+++ b/src/perfquery.c
@@ -686,7 +686,7 @@ static void vlxmittimecc_query(ib_portid_t * portid, int port, int mask)
mad_dump_perfcounters_vl_xmit_time_cong);
}
-void dump_portsamples_control(ib_portid_t * portid, int port)
+static void dump_portsamples_control(ib_portid_t *portid, int port)
{
char buf[1280];
diff --git a/src/smpdump.c b/src/smpdump.c
index e3f541085be31b..3f80ef56ca5868 100644
--- a/src/smpdump.c
+++ b/src/smpdump.c
@@ -80,7 +80,7 @@ struct drsmp {
uint8_t return_path[64];
};
-void drsmp_get_init(void *umad, DRPath * path, int attr, int mod)
+static void drsmp_get_init(void *umad, DRPath * path, int attr, int mod)
{
struct drsmp *smp = (struct drsmp *)(umad_get_mad(umad));
@@ -105,7 +105,7 @@ void drsmp_get_init(void *umad, DRPath * path, int attr, int mod)
smp->hop_cnt = (uint8_t) path->hop_cnt;
}
-void smp_get_init(void *umad, int lid, int attr, int mod)
+static void smp_get_init(void *umad, int lid, int attr, int mod)
{
struct drsmp *smp = (struct drsmp *)(umad_get_mad(umad));
@@ -123,7 +123,7 @@ void smp_get_init(void *umad, int lid, int attr, int mod)
umad_set_addr(umad, lid, 0, 0, 0);
}
-int str2DRPath(char *str, DRPath * path)
+static int str2DRPath(char *str, DRPath * path)
{
char *s;
--
2.21.0
