diff options
| author | Werner Koch <[email protected]> | 2019-06-21 08:23:35 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2019-06-21 09:42:59 +0000 |
| commit | 43dcf93407d6d2b87b6e7db74fd05fd237495bfe (patch) | |
| tree | 508f393126fd9994b7eea9a6523676be5872b949 /scd/app-common.h | |
| parent | gpg: Very minor code cleanup. (diff) | |
| download | gnupg-43dcf93407d6d2b87b6e7db74fd05fd237495bfe.tar.gz gnupg-43dcf93407d6d2b87b6e7db74fd05fd237495bfe.zip | |
scd: Simplify inclusion of app-common.h.
* scd/scdaemon.h: Include app-common.h. Remove inclusion of that
header from all other files.
(card_t, app_t): Move typedef to ...
* scd/app-common.h: here. Use them in the defs.
--
In another patch we will need apptype_t in the ctrl object and thus we
need to reorganize things a bit now. Given that most files need
app-common anyway it makes sense to always include it.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'scd/app-common.h')
| -rw-r--r-- | scd/app-common.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/scd/app-common.h b/scd/app-common.h index d3d8869fa..3925eacf7 100644 --- a/scd/app-common.h +++ b/scd/app-common.h @@ -70,13 +70,18 @@ typedef enum } apptype_t; -/* Formeard declararion. */ +/* Forward declarations. */ +struct card_ctx_s; +struct app_ctx_s; struct app_local_s; /* Defined by all app-*.c. */ +typedef struct card_ctx_s *card_t; +typedef struct app_ctx_s *app_t; + /* The object describing a card. */ struct card_ctx_s { - struct card_ctx_s *next; + card_t next; npth_mutex_t lock; @@ -114,7 +119,7 @@ struct card_ctx_s { * several applications and it is usuallay required to explicity * switch between applications. */ struct app_ctx_s { - struct app_ctx_s *next; + app_t next; card_t card; /* Link back to the card. */ |