2003-05-28 Marcus Brinkmann <[email protected]>

	* context.h (struct gpgme_context): Change EngineObject to
	engine_object_t.
	(enum ctx_op_data_type): Rename to ctx_op_data_id_t.
	(ctx_op_data_t): New type.
	(struct gpgme_context): Use it.
	* ops.h (_gpgme_op_data_lookup): Use new type name.
	* op-support.c (_gpgme_op_data_lookup): Likewise.
	* engine.c: Rename EngineObject to engine_t in the file.  Also
	EngineStatusHandler to engine_status_handler_t,
	EngineCommandHandler to engine_command_handler_t and
	EngineColonLineHandler to engine_colon_line_handler.
	* rungpg.c (start): Likewise.
	* engine-gpgsm.c: Likewise.
	* engine-backend.h (struct engine_ops): Likewise
	* engine.h (struct engine_object_s): Rename to struct engine.
	(EngineObject): Rename to engine_t.  Also everywhere else in the
	file.
	(EngineStatusHandler): Rename to engine_status_handler_t.
	(EngineColonLineHandler): Rename to engine_colon_line_handler_t.
	(EngineCommandHandler): Rename to engine_command_handler_t.

	* engine-gpgsm.c (gpgsm_export): Fix bug in last change.

1 files changed, 37 insertions, 36 deletions

diff --git a/gpgme/engine.h b/gpgme/engine.h
index 065c9067..d9a71f93 100644
--- a/gpgme/engine.h
+++ b/gpgme/engine.h
@@ -23,81 +23,82 @@
 
 #include "gpgme.h"
  
-struct engine_object_s;
-typedef struct engine_object_s *EngineObject;
+struct engine;
+typedef struct engine *engine_t;
 
-typedef gpgme_error_t (*EngineStatusHandler) (void *priv,
-					      gpgme_status_code_t code,
-					      char *args);
-typedef gpgme_error_t (*EngineColonLineHandler) (void *priv, char *line);
-typedef gpgme_error_t (*EngineCommandHandler) (void *priv,
-					       gpgme_status_code_t code,
-					       const char *keyword,
-					       int fd);
+typedef gpgme_error_t (*engine_status_handler_t) (void *priv,
+						  gpgme_status_code_t code,
+						  char *args);
+typedef gpgme_error_t (*engine_colon_line_handler_t) (void *priv, char *line);
+typedef gpgme_error_t (*engine_command_handler_t) (void *priv,
+						   gpgme_status_code_t code,
+						   const char *keyword,
+						   int fd);
 
 gpgme_error_t _gpgme_engine_new (gpgme_protocol_t proto,
-				 EngineObject *r_engine);
-void _gpgme_engine_release (EngineObject engine);
-void _gpgme_engine_set_status_handler (EngineObject engine,
-				       EngineStatusHandler fnc,
+				 engine_t *r_engine);
+void _gpgme_engine_release (engine_t engine);
+void _gpgme_engine_set_status_handler (engine_t engine,
+				       engine_status_handler_t fnc,
 				       void *fnc_value);
-gpgme_error_t _gpgme_engine_set_command_handler (EngineObject engine,
-					      EngineCommandHandler fnc,
-					      void *fnc_value,
-					      gpgme_data_t data);
-gpgme_error_t _gpgme_engine_set_colon_line_handler (EngineObject engine,
-						 EngineColonLineHandler fnc,
-						 void *fnc_value);
-gpgme_error_t _gpgme_engine_op_decrypt (EngineObject engine,
+gpgme_error_t _gpgme_engine_set_command_handler (engine_t engine,
+						 engine_command_handler_t fnc,
+						 void *fnc_value,
+						 gpgme_data_t data);
+gpgme_error_t
+_gpgme_engine_set_colon_line_handler (engine_t engine,
+				      engine_colon_line_handler_t fnc,
+				      void *fnc_value);
+gpgme_error_t _gpgme_engine_op_decrypt (engine_t engine,
 					gpgme_data_t ciph,
 					gpgme_data_t plain);
-gpgme_error_t _gpgme_engine_op_delete (EngineObject engine, gpgme_key_t key,
+gpgme_error_t _gpgme_engine_op_delete (engine_t engine, gpgme_key_t key,
 				       int allow_secret);
-gpgme_error_t _gpgme_engine_op_edit (EngineObject engine, gpgme_key_t key,
+gpgme_error_t _gpgme_engine_op_edit (engine_t engine, gpgme_key_t key,
 				     gpgme_data_t out,
 				     gpgme_ctx_t ctx /* FIXME */);
-gpgme_error_t _gpgme_engine_op_encrypt (EngineObject engine,
+gpgme_error_t _gpgme_engine_op_encrypt (engine_t engine,
 					gpgme_user_id_t recp,
 					gpgme_data_t plain, gpgme_data_t ciph,
 					int use_armor);
-gpgme_error_t _gpgme_engine_op_encrypt_sign (EngineObject engine,
+gpgme_error_t _gpgme_engine_op_encrypt_sign (engine_t engine,
 					     gpgme_user_id_t recp,
 					     gpgme_data_t plain,
 					     gpgme_data_t ciph,
 					     int use_armor,
 					     gpgme_ctx_t ctx /* FIXME */);
-gpgme_error_t _gpgme_engine_op_export (EngineObject engine,
+gpgme_error_t _gpgme_engine_op_export (engine_t engine,
 				       gpgme_user_id_t uids,
 				       gpgme_data_t keydata, int use_armor);
-gpgme_error_t _gpgme_engine_op_genkey (EngineObject engine,
+gpgme_error_t _gpgme_engine_op_genkey (engine_t engine,
 				       gpgme_data_t help_data,
 				       int use_armor, gpgme_data_t pubkey,
 				       gpgme_data_t seckey);
-gpgme_error_t _gpgme_engine_op_import (EngineObject engine,
+gpgme_error_t _gpgme_engine_op_import (engine_t engine,
 				       gpgme_data_t keydata);
-gpgme_error_t _gpgme_engine_op_keylist (EngineObject engine,
+gpgme_error_t _gpgme_engine_op_keylist (engine_t engine,
 					const char *pattern,
 					int secret_only,
 					int keylist_mode);
-gpgme_error_t _gpgme_engine_op_keylist_ext (EngineObject engine,
+gpgme_error_t _gpgme_engine_op_keylist_ext (engine_t engine,
 					    const char *pattern[],
 					    int secret_only,
 					    int reserved,
 					    int keylist_mode);
-gpgme_error_t _gpgme_engine_op_sign (EngineObject engine, gpgme_data_t in,
+gpgme_error_t _gpgme_engine_op_sign (engine_t engine, gpgme_data_t in,
 				     gpgme_data_t out, gpgme_sig_mode_t mode,
 				     int use_armor, int use_textmode,
 				     int include_certs,
 				     gpgme_ctx_t ctx /* FIXME */);
-gpgme_error_t _gpgme_engine_op_trustlist (EngineObject engine,
+gpgme_error_t _gpgme_engine_op_trustlist (engine_t engine,
 					  const char *pattern);
-gpgme_error_t _gpgme_engine_op_verify (EngineObject engine, gpgme_data_t sig,
+gpgme_error_t _gpgme_engine_op_verify (engine_t engine, gpgme_data_t sig,
 				       gpgme_data_t signed_text,
 				       gpgme_data_t plaintext);
 
-void _gpgme_engine_set_io_cbs (EngineObject engine,
+void _gpgme_engine_set_io_cbs (engine_t engine,
 			       gpgme_io_cbs_t io_cbs);
-void _gpgme_engine_io_event (EngineObject engine,
+void _gpgme_engine_io_event (engine_t engine,
 			     gpgme_event_io_t type, void *type_data);
 
 #endif /* ENGINE_H */