diff options
Diffstat (limited to 'src/engine-gpgsm.c')
| -rw-r--r-- | src/engine-gpgsm.c | 29 |
1 files changed, 2 insertions, 27 deletions
diff --git a/src/engine-gpgsm.c b/src/engine-gpgsm.c index 4b7b5a2e..0620458a 100644 --- a/src/engine-gpgsm.c +++ b/src/engine-gpgsm.c @@ -48,7 +48,6 @@ #include "data.h" #include "assuan.h" -#include "status-table.h" #include "debug.h" #include "engine-backend.h" @@ -559,9 +558,6 @@ gpgsm_set_locale (void *engine, int category, const char *value) } -/* Forward declaration. */ -static gpgme_status_code_t parse_status (const char *name); - static gpgme_error_t gpgsm_assuan_simple_command (assuan_context_t ctx, char *cmd, engine_status_handler_t status_fnc, @@ -604,7 +600,7 @@ gpgsm_assuan_simple_command (assuan_context_t ctx, char *cmd, else *(rest++) = 0; - r = parse_status (line + 2); + r = _gpgme_parse_status (line + 2); if (r >= 0 && status_fnc) err = status_fnc (status_fnc_value, r, rest); @@ -756,27 +752,6 @@ map_data_enc (gpgme_data_t d) } -static int -status_cmp (const void *ap, const void *bp) -{ - const struct status_table_s *a = ap; - const struct status_table_s *b = bp; - - return strcmp (a->name, b->name); -} - - -static gpgme_status_code_t -parse_status (const char *name) -{ - struct status_table_s t, *r; - t.name = name; - r = bsearch (&t, status_table, DIM(status_table) - 1, - sizeof t, status_cmp); - return r ? r->code : -1; -} - - static gpgme_error_t status_handler (void *opaque, int fd) { @@ -963,7 +938,7 @@ status_handler (void *opaque, int fd) else *(rest++) = 0; - r = parse_status (line + 2); + r = _gpgme_parse_status (line + 2); if (r >= 0) { |