2003-01-30 Marcus Brinkmann <marcus@g10code.de>

* types.h (EngineObject): Move typedef to ...
	* engine.h: ... here.
	* types.h (GpgObject): Move typedef to ...
	* rungpg.c: ... here.
	* types.h (GpgsmObject): Move typedef to ...
	* engine-gpgsm.c: ... here.
This commit is contained in:
Marcus Brinkmann 2003-01-30 17:28:10 +00:00
parent fb0b0b7eef
commit 7a149cc32f
5 changed files with 14 additions and 12 deletions

View File

@ -1,5 +1,12 @@
2003-01-30 Marcus Brinkmann <marcus@g10code.de> 2003-01-30 Marcus Brinkmann <marcus@g10code.de>
* types.h (EngineObject): Move typedef to ...
* engine.h: ... here.
* types.h (GpgObject): Move typedef to ...
* rungpg.c: ... here.
* types.h (GpgsmObject): Move typedef to ...
* engine-gpgsm.c: ... here.
* util.h (return_if_fail, return_null_if_fail, * util.h (return_if_fail, return_null_if_fail,
return_val_if_fail): Remove macro. return_val_if_fail): Remove macro.
* gpgme.c (gpgme_cancel): Don't use return_if_fail. * gpgme.c (gpgme_cancel): Don't use return_if_fail.

View File

@ -97,7 +97,9 @@ struct gpgsm_object_s
struct GpgmeIOCbs io_cbs; struct GpgmeIOCbs io_cbs;
}; };
typedef struct gpgsm_object_s *GpgsmObject;
static const char * static const char *
gpgsm_get_version (void) gpgsm_get_version (void)
{ {

View File

@ -23,6 +23,9 @@
#include "types.h" #include "types.h"
struct engine_object_s;
typedef struct engine_object_s *EngineObject;
GpgmeError _gpgme_engine_new (GpgmeProtocol proto, EngineObject *r_engine); GpgmeError _gpgme_engine_new (GpgmeProtocol proto, EngineObject *r_engine);
void _gpgme_engine_release (EngineObject engine); void _gpgme_engine_release (EngineObject engine);
void _gpgme_engine_set_status_handler (EngineObject engine, void _gpgme_engine_set_status_handler (EngineObject engine,

View File

@ -123,7 +123,9 @@ struct gpg_object_s
struct GpgmeIOCbs io_cbs; struct GpgmeIOCbs io_cbs;
}; };
typedef struct gpg_object_s *GpgObject;
static void static void
gpg_io_event (void *engine, GpgmeEventIO type, void *type_data) gpg_io_event (void *engine, GpgmeEventIO type, void *type_data)
{ {

View File

@ -32,18 +32,6 @@ typedef GpgmeError (*GpgmeCommandHandler) (void*, GpgmeStatusCode code,
const char *keyword, const char **result); const char *keyword, const char **result);
/*-- engine.c --*/
struct engine_object_s;
typedef struct engine_object_s *EngineObject;
/*-- engine-gpgsm.c --*/
struct gpgsm_object_s;
typedef struct gpgsm_object_s *GpgsmObject;
/*-- rungpg.c --*/
struct gpg_object_s;
typedef struct gpg_object_s *GpgObject;
/*-- verify.c --*/ /*-- verify.c --*/
struct verify_result_s; struct verify_result_s;
typedef struct verify_result_s *VerifyResult; typedef struct verify_result_s *VerifyResult;