diff options
author | Marcus Brinkmann <[email protected]> | 2012-02-14 12:03:46 +0000 |
---|---|---|
committer | Marcus Brinkmann <[email protected]> | 2012-02-14 12:34:44 +0000 |
commit | 885243e05467e79e2375b3febe7904053ab45dfc (patch) | |
tree | 2eb90674c28bf54126beb7c4e1e1d11f016066c9 /src/extra-stati.h | |
parent | Use gpgme interface for error handling to avoid linking with gpg-error. (diff) | |
download | gpgme-885243e05467e79e2375b3febe7904053ab45dfc.tar.gz gpgme-885243e05467e79e2375b3febe7904053ab45dfc.zip |
Rework status table to be less dynamically generated.
* src/Makefile.am (EXTRA_DIST): Remove mkstatus.
(BUILT_SOURCE, MOSTLYCLEANFILES): Remove.
(main_sources): Remove status-table.h, extra-stati.h.
Add status-table.c.
(status-table.h): Remove rules for built source.
* src/decrypt.c: Don't include extra-stati.h.
* src/engine-gpg.c: Don't include status-table.h.
(status_cmp): Remove function.
(read_status): Use _gpgme_parse_status.
* src/engine-gpgsm.c: Don't include status-table.h.
(status_cmp, parse_status): Remove function.
(gpgsm_assuan_simple_command, status_handler): Use _gpgme_parse_status.
* src/engine-uiserver.c: Don't include status-table.h.
(status_cmp, parse_status): Remove function.
(uiserver_assuan_simple_command, status_handler): Use
_gpgme_parse_status.
* src/gpgme.h.in (gpgme_status_code_t): Add
GPGME_STATUS_DECRYPTION_INFO.
* src/util.h (_gpgme_status_init,_gpgme_parse_status): New declaration.
* src/status-table.c: New file.
* src/extra-stati.h, src/mkstatus: Files removed.
* version.c (do_subsystem_inits): Call _gpgme_status_init.
Diffstat (limited to 'src/extra-stati.h')
-rw-r--r-- | src/extra-stati.h | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/src/extra-stati.h b/src/extra-stati.h deleted file mode 100644 index 59cccf98..00000000 --- a/src/extra-stati.h +++ /dev/null @@ -1,29 +0,0 @@ -/* extra-stati.lst - Extra GnuPG status codes. - Copyright 2011 g10 Code GmbH - - This file is free software; as a special exception the author gives - unlimited permission to copy and/or distribute it, with or without - modifications, as long as this notice is preserved. - - This file is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY, to the extent permitted by law; without even - the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - PURPOSE. */ - -/* A list of internal status code to be processed by mkstatus. Those - * status codes are not part of the API but internally required by - * gpgme. We use a second enum type here but make sure that the - * values don't clash with those of gpgme_status_code_t. - */ - -enum - { - /* This value is the first used one. It needs to be larger than - the last value of gpgme_status_code_t. There is no need to - explictly list the values because they are internal only. */ - _GPGME_STATUS_FIRST_EXTRA = 192, - - GPGME_STATUS_DECRYPTION_INFO, - - _GPGME_STATUS_LAST_EXTRA - }; |