summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoralfred <alfred@FreeBSD.org>2002-06-01 07:18:32 +0000
committeralfred <alfred@FreeBSD.org>2002-06-01 07:18:32 +0000
commitb5fffbc6158c3faffa8b4acf671c1676a7cda50b (patch)
tree3adce91885eaf4717286bb82ca2cd98bf7360539
parent0ef59d0f18e5853e3e5fa8f8efd2c8f6e5a3bc62 (diff)
downloadFreeBSD-src-b5fffbc6158c3faffa8b4acf671c1676a7cda50b.zip
FreeBSD-src-b5fffbc6158c3faffa8b4acf671c1676a7cda50b.tar.gz
Should have been part of recent commit:
Fix GCC warnings caused by initializing a zero length array. In the process, simply things a bit by getting rid of 'struct ng_parse_struct_info' which was useless because it only contained one field. But now I'm unbreaking compilation by adjusting these files to the recent netgraph change.
-rw-r--r--sys/dev/usb/udbp.c6
-rw-r--r--sys/dev/usb/udbp.h2
2 files changed, 3 insertions, 5 deletions
diff --git a/sys/dev/usb/udbp.c b/sys/dev/usb/udbp.c
index 1c903894..3669680 100644
--- a/sys/dev/usb/udbp.c
+++ b/sys/dev/usb/udbp.c
@@ -161,11 +161,11 @@ Static ng_rcvdata_t ng_udbp_rcvdata;
Static ng_disconnect_t ng_udbp_disconnect;
/* Parse type for struct ngudbpstat */
-Static const struct ng_parse_struct_info
- ng_udbp_stat_type_info = NG_UDBP_STATS_TYPE_INFO;
+Static const struct ng_parse_struct_field
+ ng_udbp_stat_type_fields[] = NG_UDBP_STATS_TYPE_INFO;
Static const struct ng_parse_type ng_udbp_stat_type = {
&ng_parse_struct_type,
- &ng_udbp_stat_type_info
+ &ng_udbp_stat_type_fields
};
/* List of commands and how to convert arguments to/from ASCII */
diff --git a/sys/dev/usb/udbp.h b/sys/dev/usb/udbp.h
index a3b04aa..b447fcb 100644
--- a/sys/dev/usb/udbp.h
+++ b/sys/dev/usb/udbp.h
@@ -72,11 +72,9 @@ struct ngudbpstat {
* This needs to be kept in sync with the above structure definition
*/
#define NG_UDBP_STATS_TYPE_INFO { \
- { \
{ "packets_in", &ng_parse_int32_type }, \
{ "packets_out", &ng_parse_int32_type }, \
{ NULL }, \
- } \
}
#endif /* _NETGRAPH_UDBP_H_ */
OpenPOWER on IntegriCloud