Skip to content

Commit 565639a

Browse files
TwCoryTwCory
committed
push headers with opaque struct declarations
1 parent e46edcb commit 565639a

32 files changed

+212
-71
lines changed

‎include/nbapi/voltos/acct.h‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#ifndef _NBAPI_VOLTOS_ACCT_H_
2+
#define _NBAPI_VOLTOS_ACCT_H_
3+
4+
#include <voltos/types.h>
5+
6+
typedef struct voltos_acct voltos_acct;
7+
8+
#endif /* _NBAPI_VOLTOS_ACCT_H_ */

‎include/nbapi/voltos/auxvec.h‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#ifndef _NBAPI_VOLTOS_AUXVEC_H_
2+
#define _NBAPI_VOLTOS_AUXVEC_H_
3+
4+
#define AT_NULL 0
5+
#define AT_IGNORE 1
6+
7+
#endif /* _NBAPI_VOLTOS_AUXVEC_H_ */

‎include/nbapi/voltos/counter.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#ifndef _NBAPI_VOLTOS_COUNTER_H_
22
#define _NBAPI_VOLTOS_COUNTER_H_
33

4-
4+
typedef struct counter_component counter_component;
5+
typedef struct counter_watch counter_watch;
6+
typedef struct counter_event counter_event;
57

68
#endif /* _NBAPI_VOLTOS_COUNTER_H_ */

‎include/nbapi/voltos/nexthop.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef _NBAPI_VOLTOS_NEXTHOP_H_
22
#define _NBAPI_VOLTOS_NEXTHOP_H_
33

4-
struct nexthop;
5-
struct nh_group;
4+
typedef struct nexthop nexthop;
5+
typedef struct nexthop_group nexthop_group;
66

77
#endif /* _NBAPI_VOLTOS_NEXTHOP_H_ */

‎include/nbapi/voltos/socket.h‎

Lines changed: 2 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -11,54 +11,9 @@
1111
/* Match Linux kernel socket storage max size */
1212
#define _V_SS_MAXSIZE 128
1313

14-
/* Socket address family number */
15-
typedef __u16 __voltos_sa_family_t;
1614

17-
#define SA_FAMILY_APPLETALK AF_APPLETALK
18-
#define SA_FAMILY_ATM_PVC AF_ATMPVC
19-
#define SA_FAMILY_ATM_SVC AF_ATMSVC
20-
#define SA_FAMILY_AX25 AF_AX25
21-
#define SA_FAMILY_BLUETOOTH AF_BLUETOOTH
22-
#define SA_FAMILY_BRIDGE AF_BRIDGE
23-
#define SA_FAMILY_CAN AF_CAN
24-
#define SA_FAMILY_DECNET AF_DECnet
25-
#define SA_FAMILY_FILE AF_FILE
26-
#define SA_FAMILY_IEEE802154 AF_IEEE802154
27-
#define SA_FAMILY_INFINIBAND AF_IB
28-
#define SA_FAMILY_IPV4 AF_INET
29-
#define SA_FAMILY_IPV6 AF_INET6
30-
#define SA_FAMILY_IPX AF_IPX
31-
#define SA_FAMILY_ISDN AF_ISDN
32-
#define SA_FAMILY_KEY AF_KEY
33-
#define SA_FAMILY_LLC AF_LLC
34-
#define SA_FAMILY_LOCAL AF_LOCAL
35-
#define SA_FAMILY_MPLS AF_MPLS
36-
#define SA_FAMILY_NETLINK AF_NETLINK
37-
#define SA_FAMILY_PACKET AF_PACKET
38-
#define SA_FAMILY_PHONET AF_PHONET
39-
#define SA_FAMILY_PPPOX AF_PPPOX
40-
#define SA_FAMILY_RDS AF_RDS
41-
#define SA_FAMILY_ROSE AF_ROSE
42-
#define SA_FAMILY_ROUTE AF_ROUTE
43-
#define SA_FAMILY_TIPC AF_TIPC
44-
#define SA_FAMILY_UNIX AF_UNIX
45-
#define SA_FAMILY_UNSPEC AF_UNSPEC
46-
#define SA_FAMILY_WAN_PIPE AF_WANPIPE
47-
#define SA_FAMILY_X25 AF_X25
48-
#define SA_FAMILY_XDP AF_XDP
15+
typedef u16 voltos_sa_family_t;
4916

50-
/*
51-
* Derived from Linux kernel socket header <uapi/linux/socket.h>
52-
*/
53-
typedef struct __voltos_sockaddr_storage
54-
{
55-
union {
56-
struct {
57-
__voltos_sa_family_t ss_family;
58-
__string ss_data[_V_SS_MAXSIZE - sizeof(__u16)];
59-
};
60-
void *ss_align;
61-
};
62-
} __voltos_sockaddr_storage_t;
17+
typedef struct voltos_sockaddr_storage voltos_sockaddr_storage;
6318

6419
#endif /* _NBAPI_VOLTOS_SOCKET_H_ */

‎include/nbapi/voltos/time-types.h‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#ifndef _NBAPI_VOLTOS_TIME_TYPES_H_
2+
#define _NBAPI_VOLTOS_TIME_TYPES_H_
3+
4+
#include <voltos/types.h>
5+
6+
typedef struct voltos_timespec voltos_timespec;
7+
8+
typedef struct voltos_itimerspec voltos_itimerspec;
9+
10+
typedef struct voltos_socket_timeval voltos_socket_timeval;
11+
12+
#endif /* _NBAPI_VOLTOS_TIME_TYPES_H_ */

‎include/nbapi/voltos/time.h‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,17 @@
22
#ifndef _NBAPI_VOLTOS_TIME_H_
33
#define _NBAPI_VOLTOS_TIME_H_
44

5-
#include <stdint.h>
6-
#include <time.h>
7-
#include <sys/time.h>
5+
#include <voltos/types.h>
6+
#include <nbapi/voltos/time-types.h>
87

9-
typedef int32_t __hours32;
10-
typedef int32_t __minutes32;
11-
typedef int32_t __seconds32;
8+
typedef struct timespec timespec;
9+
10+
typedef struct timeval timeval;
11+
12+
typedef struct itimerspec itimerspec;
13+
14+
typedef struct itimerval itimerval;
15+
16+
typedef struct timezone timezone;
1217

1318
#endif /* _NBAPI_VOLTOS_TIME_H_ */

‎include/nbapi/voltos/times.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#ifndef _NBAPI_VOLTOS_TIMES_H_
2+
#define _NBAPI_VOLTOS_TIMES_H_
3+
4+
typedef struct voltos_tms voltos_tms;
5+
6+
#endif /* _NBAPI_VOLTOS_TIMES_H_ */

‎include/nbapi/voltos/utsname.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33

44
#define UTS_NAMSIZ 64
55

6-
struct uts_name
6+
typedef struct uts_name
77
{
88
char host[UTS_NAMSIZ + 1];
99
char node[UTS_NAMSIZ + 1];
1010
char release[UTS_NAMSIZ + 1];
1111
char version[UTS_NAMSIZ + 1];
1212
char machine[UTS_NAMSIZ + 1];
1313
char domain[UTS_NAMSIZ + 1];
14-
};
14+
} uts_name;
1515

1616
#endif /* _NBAPI_VOLTOS_UTSNAME_H_ */

‎include/net/clns_fib.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#ifndef _NET_CLNS_FIB_H_
2+
#define _NET_CLNS_FIB_H_
3+
4+
typedef struct clns_fib clns_fib;
5+
6+
#endif /* _NET_CLNS_FIB_H_ */

0 commit comments

Comments
 (0)