From 0a882398e1ce8a1f616118476983466b53b14ba6 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Sun, 18 May 2003 20:45:24 +0000 Subject: 2003-05-18 Marcus Brinkmann In all files, replace the Gpgme* type names with the new gpgme_* type names. doc/ 2003-05-18 Marcus Brinkmann * gpgme.texi (Header): Remove Gpgme as namespace prefix. Add _GPGME to namespace prefix. * gpgme.texi (Multi Threading): Add note about link order. gpgme/ 2003-05-18 Marcus Brinkmann * gpgme.h: The following types are renamed. The old name is kept as a deprecated typedef. (GpgmeCtx): Rename to gpgme_ctx_t. (GpgmeData): Rename to gpgme_data_t. (GpgmeRecipients): Rename to gpgme_recipients_t. (GpgmeError): Rename to gpgme_error_t. (GpgmeDataEncoding): Rename to gpgme_data_encoding_t. (GpgmePubKeyAlgo): Rename to gpgme_pubkey_algo_t. (GpgmeHashAlgo): Rename to gpgme_hash_algo_t. (GpgmeSigStat): Rename to gpgme_sig_stat_t. (GpgmeSigMode): Rename to gpgme_sig_mode_t. (GpgmeAttr): Rename to gpgme_attr_t. (GpgmeValidity): Rename to gpgme_validity_t. (GpgmeProtocol): Rename to gpgme_protocol_t. (GpgmeStatusCode): Rename to gpgme_status_code_t. (GpgmeEngineInfo): Rename to gpgme_engine_info_t. (GpgmeSubkey): Rename to gpgme_subkey_t. (GpgmeKeySig): Rename to gpgme_keysig_t. (GpgmeUserID): Rename to gpgme_user_id_t. (GpgmePassphraseCb): Rename to gpgme_passphrase_cb_t. (GpgmeProgressCb): Rename to gpgme_progress_cb_t. (GpgmeEditCb): Rename to gpgme_edit_cb_t. (GpgmeIOCb): Rename to gpgme_io_cb_t. (GpgmeRegisterIOCb): Rename to gpgme_register_io_cb_t. (GpgmeRemoveIOCb): Rename to gpgme_remove_io_cb_t. (GpgmeEventIO): Rename to gpgme_event_io_t. (GpgmeEventIOCb): Rename to gpgme_event_io_cb_t. (GpgmeIOCbs): Rename to gpgme_io_cbs. (gpgme_io_cbs_t): New type. (GpgmeDataReadCb): Rename to gpgme_data_read_cb_t. (GpgmeDataWriteCb): Rename to gpgme_data_write_cb_t. (GpgmeDataSeekCb): Rename to gpgme_data_seek_cb_t. (GpgmeDataReleaseCb): Rename to gpgme_data_release_cb_t. (GpgmeDataCbs): Rename to gpgme_data_cbs. (gpgme_data_cbs_t): New type. (GpgmeInvalidUserID): Rename to gpgme_invalid_user_id_t. (GpgmeEncryptResult): Rename to gpgme_encrypt_result_t. (GpgmeDecryptResult): Rename to gpgme_decrypt_result_t. (GpgmeNewSignature): Rename to gpgme_new_signature_t. (GpgmeSignResult): Rename to gpgme_sign_result_t. (GpgmeSigNotation): Rename to gpgme_sig_notation_t. (GpgmeSignature): Rename to gpgme_signature_t. (GpgmeVerifyResult): Rename to gpgme_verify_result_t. (GpgmeImportStatus): Rename to gpgme_import_status_t. (GpgmeImportResult): Rename to gpgme_import_result_t. (GpgmeGenKeyResult): Rename to gpgme_genkey_result_t. (GpgmeKeyListResult): Rename to gpgme_keylist_result_t. (GpgmeTrustItem): Rename to gpgme_trust_item_t. * gpgme.h (gpgme_deprecated_error_t): New type, swallowing macros GPGME_No_Recipients, GPGME_Invalid_Recipient and GPGME_No_Passphrase. * data.h (struct gpgme_data_s): Rename to struct gpgme_data. * context.h (struct gpgme_context_s): Rename to struct gpgme_context. (struct gpgme_recipients_s): Rename to gpgme_recipients. --- tests/gpg/t-edit.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'tests/gpg/t-edit.c') diff --git a/tests/gpg/t-edit.c b/tests/gpg/t-edit.c index 89638327..a90ebff6 100644 --- a/tests/gpg/t-edit.c +++ b/tests/gpg/t-edit.c @@ -28,13 +28,13 @@ #include struct passphrase_cb_info_s { - GpgmeCtx c; + gpgme_ctx_t c; int did_it; }; #define fail_if_err(a) do { if(a) { int my_errno = errno; \ - fprintf (stderr, "%s:%d: GpgmeError %s\n", \ + fprintf (stderr, "%s:%d: gpgme_error_t %s\n", \ __FILE__, __LINE__, gpgme_strerror(a)); \ if ((a) == GPGME_File_Error) \ fprintf (stderr, "\terrno=`%s'\n", strerror (my_errno)); \ @@ -42,7 +42,7 @@ struct passphrase_cb_info_s { } while(0) static void -flush_data (GpgmeData dh) +flush_data (gpgme_data_t dh) { char buf[100]; int ret; @@ -57,7 +57,7 @@ flush_data (GpgmeData dh) } -static GpgmeError +static gpgme_error_t passphrase_cb (void *opaque, const char *desc, void **r_hd, const char **result) { @@ -73,10 +73,10 @@ passphrase_cb (void *opaque, const char *desc, } -GpgmeError -edit_fnc (void *opaque, GpgmeStatusCode status, const char *args, const char **result) +gpgme_error_t +edit_fnc (void *opaque, gpgme_status_code_t status, const char *args, const char **result) { - GpgmeData out = (GpgmeData) opaque; + gpgme_data_t out = (gpgme_data_t) opaque; fputs ("[-- Response --]\n", stdout); flush_data (out); @@ -120,10 +120,10 @@ edit_fnc (void *opaque, GpgmeStatusCode status, const char *args, const char **r int main (int argc, char **argv) { - GpgmeCtx ctx; - GpgmeError err; - GpgmeData out = NULL; - GpgmeKey key = NULL; + gpgme_ctx_t ctx; + gpgme_error_t err; + gpgme_data_t out = NULL; + gpgme_key_t key = NULL; struct passphrase_cb_info_s info; const char *pattern = "Alpha"; char *p; -- cgit v1.2.3