From cd35df0817596ff3db186b2e1333b6df56e57f77 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Sat, 22 Jan 2011 14:10:51 +1030 Subject: [PATCH] lca2011: mark types in header with CDUMP annotations. Header from folded patch 'cdump-avoid-fde.patch': lca2011: ignore unknown tevent_fd fields. --- ccan/oserver/_info | 1 + ccan/oserver/oserver_types.h | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ccan/oserver/_info b/ccan/oserver/_info index 5a69855..4f54687 100644 --- a/ccan/oserver/_info +++ b/ccan/oserver/_info @@ -51,6 +51,7 @@ int main(int argc, char *argv[]) printf("ccan/opt\n"); printf("ccan/array_size\n"); printf("ccan/tevent\n"); + printf("ccan/cdump\n"); return 0; } diff --git a/ccan/oserver/oserver_types.h b/ccan/oserver/oserver_types.h index 78ef48c..4eabc67 100644 --- a/ccan/oserver/oserver_types.h +++ b/ccan/oserver/oserver_types.h @@ -1,8 +1,9 @@ #ifndef CCAN_OSERVER_TYPES_H #define CCAN_OSERVER_TYPES_H #include +#include -enum state { +CDUMP_SAVED enum state { SENDING_GREETING, RECEIVING_USER_QUESTION, SENDING_OTHER_QUESTION_PREFIX, @@ -13,11 +14,11 @@ enum state { FINISHED }; -struct client { +CDUMP_SAVED struct client { /* What are we doing today, brain? */ enum state state; /* Our event info, and the file descriptor. */ - struct tevent_fd *fde; + struct tevent_fd *fde CDUMP_IGNORE; int fd; /* The question we read from client. */ char *question; @@ -33,10 +34,10 @@ struct client { struct client *oracle; }; -struct oserver { +CDUMP_SAVED struct oserver { /* 5 clients should be enough for anybody! */ struct client *clients[5]; int fd; - struct tevent_fd *fde; + struct tevent_fd *fde CDUMP_IGNORE; }; #endif /* CCAN_OSERVER_TYPES_H */ -- 2.39.2