Some management headers use uint type which (on my system) is described as "old
compatibility name for C type". This type might not defined e.g. if
__STRICT_ANSI__ is set, so it is best to avoid its usage at least in headers.
Replace by unsigned in all headers.
Signed-off-by: Michael S. Tsirkin <[EMAIL PROTECTED]>
---
Hal can you apply this please? As a separate question:
I didn't go over .c files (we don't build them with strict ansi now),
but maybe removing uint there is a good idea, too?
diff --git a/libibcommon/include/infiniband/common.h
b/libibcommon/include/infiniband/common.h
index 4c90955..80bfe1b 100644
--- a/libibcommon/include/infiniband/common.h
+++ b/libibcommon/include/infiniband/common.h
@@ -131,7 +131,7 @@ int sys_read_string(char *dir_name, char *file_name, char
*str, int max_len);
int sys_read_guid(char *dir_name, char *file_name, uint64_t *net_guid);
int sys_read_gid(char *dir_name, char *file_name, uint8_t *gid);
int sys_read_uint64(char *dir_name, char *file_name, uint64_t *u);
-int sys_read_uint(char *dir_name, char *file_name, uint *u);
+int sys_read_uint(char *dir_name, char *file_name, unsigned *u);
/* stack.c */
void stack_dump(void);
diff --git a/libibmad/include/infiniband/mad.h
b/libibmad/include/infiniband/mad.h
index a349e0f..ae847c9 100644
--- a/libibmad/include/infiniband/mad.h
+++ b/libibmad/include/infiniband/mad.h
@@ -166,8 +166,8 @@ typedef struct {
} ib_dr_path_t;
typedef struct {
- uint id;
- uint mod;
+ unsigned id;
+ unsigned mod;
} ib_attr_t;
typedef struct {
@@ -180,7 +180,7 @@ typedef struct {
uint64_t mkey;
uint64_t trid; /* used for out mad if nonzero, return real val */
uint64_t mask; /* for sa mads */
- uint recsz; /* for sa mads (attribute offset) */
+ unsigned recsz; /* for sa mads (attribute offset) */
int timeout;
uint32_t oui; /* for vendor range 2 mads */
} ib_rpc_t;
@@ -193,7 +193,7 @@ typedef struct portid {
uint32_t qp;
uint32_t qkey;
uint8_t sl;
- uint pkey_idx;
+ unsigned pkey_idx;
} ib_portid_t;
typedef void (ib_mad_dump_fn)(char *buf, int bufsz, void *val, int valsz);
@@ -566,23 +566,23 @@ enum SA_SIZES_ENUM {
};
typedef struct ib_sa_call {
- uint attrid;
- uint mod;
+ unsigned attrid;
+ unsigned mod;
uint64_t mask;
- uint method;
+ unsigned method;
uint64_t trid; /* used for out mad if nonzero, return real val */
- uint recsz; /* return field */
+ unsigned recsz; /* return field */
ib_rmpp_hdr_t rmpp;
} ib_sa_call_t;
typedef struct ib_vendor_call {
- uint method;
- uint mgmt_class;
- uint attrid;
- uint mod;
+ unsigned method;
+ unsigned mgmt_class;
+ unsigned attrid;
+ unsigned mod;
uint32_t oui;
- uint timeout;
+ unsigned timeout;
ib_rmpp_hdr_t rmpp;
} ib_vendor_call_t;
@@ -740,14 +740,14 @@ void * mad_rpc_rmpp(void *ibmad_port, ib_rpc_t *rpc,
ib_portid_t *dport,
ib_rmpp_hdr_t *rmpp, void *data);
/* smp.c */
-uint8_t * smp_query(void *buf, ib_portid_t *id, uint attrid, uint mod,
- uint timeout);
-uint8_t * smp_set(void *buf, ib_portid_t *id, uint attrid, uint mod,
- uint timeout);
+uint8_t * smp_query(void *buf, ib_portid_t *id, unsigned attrid, unsigned mod,
+ unsigned timeout);
+uint8_t * smp_set(void *buf, ib_portid_t *id, unsigned attrid, unsigned mod,
+ unsigned timeout);
inline static uint8_t *
-safe_smp_query(void *rcvbuf, ib_portid_t *portid, uint attrid, uint mod,
- uint timeout)
+safe_smp_query(void *rcvbuf, ib_portid_t *portid, unsigned attrid, unsigned
mod,
+ unsigned timeout)
{
uint8_t *p;
@@ -759,8 +759,8 @@ safe_smp_query(void *rcvbuf, ib_portid_t *portid, uint
attrid, uint mod,
}
inline static uint8_t *
-safe_smp_set(void *rcvbuf, ib_portid_t *portid, uint attrid, uint mod,
- uint timeout)
+safe_smp_set(void *rcvbuf, ib_portid_t *portid, unsigned attrid, unsigned mod,
+ unsigned timeout)
{
uint8_t *p;
@@ -773,15 +773,15 @@ safe_smp_set(void *rcvbuf, ib_portid_t *portid, uint
attrid, uint mod,
/* sa.c */
uint8_t * sa_call(void *rcvbuf, ib_portid_t *portid, ib_sa_call_t *sa,
- uint timeout);
+ unsigned timeout);
uint8_t * sa_rpc_call(void *ibmad_port, void *rcvbuf, ib_portid_t *portid,
- ib_sa_call_t *sa, uint timeout);
+ ib_sa_call_t *sa, unsigned timeout);
int ib_path_query(ib_gid_t srcgid, ib_gid_t destgid, ib_portid_t *sm_id,
void *buf); /* returns lid */
inline static uint8_t *
safe_sa_call(void *rcvbuf, ib_portid_t *portid, ib_sa_call_t *sa,
- uint timeout)
+ unsigned timeout)
{
uint8_t *p;
@@ -802,19 +802,19 @@ int ib_resolve_self(ib_portid_t *portid, int
*portnum, ib_gid_t *gid);
/* gs.c */
uint8_t *perf_classportinfo_query(void *rcvbuf, ib_portid_t *dest, int port,
- uint timeout);
+ unsigned timeout);
uint8_t *port_performance_query(void *rcvbuf, ib_portid_t *dest, int port,
- uint timeout);
+ unsigned timeout);
uint8_t *port_performance_reset(void *rcvbuf, ib_portid_t *dest, int port,
- uint mask, uint timeout);
+ unsigned mask, unsigned timeout);
uint8_t *port_performance_ext_query(void *rcvbuf, ib_portid_t *dest, int port,
- uint timeout);
+ unsigned timeout);
uint8_t *port_performance_ext_reset(void *rcvbuf, ib_portid_t *dest, int port,
- uint mask, uint timeout);
+ unsigned mask, unsigned timeout);
uint8_t *port_samples_control_query(void *rcvbuf, ib_portid_t *dest, int port,
- uint timeout);
+ unsigned timeout);
uint8_t *port_samples_result_query(void *rcvbuf, ib_portid_t *dest, int port,
- uint timeout);
+ unsigned timeout);
/* dump.c */
ib_mad_dump_fn
diff --git a/libibumad/include/infiniband/umad.h
b/libibumad/include/infiniband/umad.h
index 9020649..6149c8c 100644
--- a/libibumad/include/infiniband/umad.h
+++ b/libibumad/include/infiniband/umad.h
@@ -120,13 +120,13 @@ typedef struct ib_user_mad {
typedef struct umad_port {
char ca_name[UMAD_CA_NAME_LEN];
int portnum;
- uint base_lid;
- uint lmc;
- uint sm_lid;
- uint sm_sl;
- uint state;
- uint phys_state;
- uint rate;
+ unsigned base_lid;
+ unsigned lmc;
+ unsigned sm_lid;
+ unsigned sm_sl;
+ unsigned state;
+ unsigned phys_state;
+ unsigned rate;
uint64_t capmask;
uint64_t gid_prefix;
uint64_t port_guid;
@@ -134,7 +134,7 @@ typedef struct umad_port {
typedef struct umad_ca {
char ca_name[UMAD_CA_NAME_LEN];
- uint node_type;
+ unsigned node_type;
int numports;
char fw_ver[20];
char ca_type[40];
--
MST
_______________________________________________
general mailing list
[email protected]
http://lists.openfabrics.org/cgi-bin/mailman/listinfo/general
To unsubscribe, please visit http://openib.org/mailman/listinfo/openib-general
