Beautify source code.

diff --git a/trunk/gpgme/data.h b/trunk/gpgme/data.h
index 26189d0964b9554dcc8cce986813b99616ea305e..57815ef3d0d3c1f884338903a91c7415519a8aa6 100644 (file)
--- a/trunk/gpgme/data.h
+++ b/trunk/gpgme/data.h
@@ -45,7 +45,8 @@ typedef ssize_t (*gpgme_data_write_cb) (gpgme_data_t dh, const void *buffer,
 /* Set the current position from where the next read or write starts
    in the data object with the handle DH to OFFSET, relativ to
    WHENCE.  */
-typedef off_t (*gpgme_data_seek_cb) (gpgme_data_t dh, off_t offset, int whence);
+typedef off_t (*gpgme_data_seek_cb) (gpgme_data_t dh, off_t offset,
+                                    int whence);
 
 /* Release the data object with the handle DH.  */
 typedef void (*gpgme_data_release_cb) (gpgme_data_t dh);
@@ -111,7 +112,8 @@ struct gpgme_data
 };
 
 \f
-gpgme_error_t _gpgme_data_new (gpgme_data_t *r_dh, struct _gpgme_data_cbs *cbs);
+gpgme_error_t _gpgme_data_new (gpgme_data_t *r_dh,
+                              struct _gpgme_data_cbs *cbs);
 
 void _gpgme_data_release (gpgme_data_t dh);
 

diff --git a/trunk/gpgme/decrypt-verify.c b/trunk/gpgme/decrypt-verify.c
index 0d508d0459806d093e511bf19cd9e210bd91b2ae..33306e8bbbe312f825af0287d71ac5db1f4fcf71 100644 (file)
--- a/trunk/gpgme/decrypt-verify.c
+++ b/trunk/gpgme/decrypt-verify.c
@@ -27,7 +27,8 @@
 
 \f
 static gpgme_error_t
-decrypt_verify_status_handler (void *priv, gpgme_status_code_t code, char *args)
+decrypt_verify_status_handler (void *priv, gpgme_status_code_t code,
+                              char *args)
 {
   return _gpgme_decrypt_status_handler (priv, code, args)
     || _gpgme_verify_status_handler (priv, code, args);
@@ -59,9 +60,8 @@ _gpgme_op_decrypt_verify_start (gpgme_ctx_t ctx, int synchronous,
 
   if (ctx->passphrase_cb)
     {
-      err = _gpgme_engine_set_command_handler (ctx->engine,
-                                              _gpgme_passphrase_command_handler,
-                                              ctx, NULL);
+      err = _gpgme_engine_set_command_handler
+       (ctx->engine, _gpgme_passphrase_command_handler, ctx, NULL);
       if (err)
        return err;
     }
@@ -76,7 +76,8 @@ _gpgme_op_decrypt_verify_start (gpgme_ctx_t ctx, int synchronous,
 /* Decrypt ciphertext CIPHER and make a signature verification within
    CTX and store the resulting plaintext in PLAIN.  */
 gpgme_error_t
-gpgme_op_decrypt_verify_start (gpgme_ctx_t ctx, gpgme_data_t cipher, gpgme_data_t plain)
+gpgme_op_decrypt_verify_start (gpgme_ctx_t ctx, gpgme_data_t cipher,
+                              gpgme_data_t plain)
 {
   return _gpgme_op_decrypt_verify_start (ctx, 0, cipher, plain);
 }
@@ -85,7 +86,8 @@ gpgme_op_decrypt_verify_start (gpgme_ctx_t ctx, gpgme_data_t cipher, gpgme_data_
 /* Decrypt ciphertext CIPHER and make a signature verification within
    CTX and store the resulting plaintext in PLAIN.  */
 gpgme_error_t
-gpgme_op_decrypt_verify (gpgme_ctx_t ctx, gpgme_data_t cipher, gpgme_data_t plain)
+gpgme_op_decrypt_verify (gpgme_ctx_t ctx, gpgme_data_t cipher,
+                        gpgme_data_t plain)
 {
   gpgme_error_t err = _gpgme_op_decrypt_verify_start (ctx, 1, cipher, plain);
   if (!err)

diff --git a/trunk/gpgme/decrypt.c b/trunk/gpgme/decrypt.c
index 11916555ca55b4351111a98fae32065a37b03a89..7e27ac2b20af7b7156c3185fe7d60ee809d52d75 100644 (file)
--- a/trunk/gpgme/decrypt.c
+++ b/trunk/gpgme/decrypt.c
@@ -64,7 +64,8 @@ gpgme_op_decrypt_result (gpgme_ctx_t ctx)
 
 \f
 gpgme_error_t
-_gpgme_decrypt_status_handler (void *priv, gpgme_status_code_t code, char *args)
+_gpgme_decrypt_status_handler (void *priv, gpgme_status_code_t code,
+                              char *args)
 {
   gpgme_ctx_t ctx = (gpgme_ctx_t) priv;
   gpgme_error_t err;
@@ -170,9 +171,8 @@ decrypt_start (gpgme_ctx_t ctx, int synchronous,
 
   if (ctx->passphrase_cb)
     {
-      err = _gpgme_engine_set_command_handler (ctx->engine,
-                                              _gpgme_passphrase_command_handler,
-                                              ctx, NULL);
+      err = _gpgme_engine_set_command_handler
+       (ctx->engine, _gpgme_passphrase_command_handler, ctx, NULL);
       if (err)
        return err;
     }
@@ -185,7 +185,8 @@ decrypt_start (gpgme_ctx_t ctx, int synchronous,
 
 
 gpgme_error_t
-gpgme_op_decrypt_start (gpgme_ctx_t ctx, gpgme_data_t cipher, gpgme_data_t plain)
+gpgme_op_decrypt_start (gpgme_ctx_t ctx, gpgme_data_t cipher,
+                       gpgme_data_t plain)
 {
   return decrypt_start (ctx, 0, cipher, plain);
 }

diff --git a/trunk/gpgme/delete.c b/trunk/gpgme/delete.c
index cd7efb1e7299ff987d37669708c3777ad5ca2e80..3eca4ecd4582291509ad9c8bb2f911807d83a084 100644 (file)
--- a/trunk/gpgme/delete.c
+++ b/trunk/gpgme/delete.c
@@ -89,7 +89,8 @@ delete_start (gpgme_ctx_t ctx, int synchronous, const gpgme_key_t key,
 /* Delete KEY from the keyring.  If ALLOW_SECRET is non-zero, secret
    keys are also deleted.  */
 gpgme_error_t
-gpgme_op_delete_start (gpgme_ctx_t ctx, const gpgme_key_t key, int allow_secret)
+gpgme_op_delete_start (gpgme_ctx_t ctx, const gpgme_key_t key,
+                      int allow_secret)
 {
   return delete_start (ctx, 0, key, allow_secret);
 }

diff --git a/trunk/gpgme/encrypt.c b/trunk/gpgme/encrypt.c
index 148823982744aebf087de9e889b6af940391c68d..a5be70bf29d564bc7f8698a1b4ce1b8c20342fd9 100644 (file)
--- a/trunk/gpgme/encrypt.c
+++ b/trunk/gpgme/encrypt.c
@@ -71,7 +71,8 @@ gpgme_op_encrypt_result (gpgme_ctx_t ctx)
 
 \f
 gpgme_error_t
-_gpgme_encrypt_status_handler (void *priv, gpgme_status_code_t code, char *args)
+_gpgme_encrypt_status_handler (void *priv, gpgme_status_code_t code,
+                              char *args)
 {
   gpgme_ctx_t ctx = (gpgme_ctx_t) priv;
   gpgme_error_t err;
@@ -159,9 +160,8 @@ encrypt_start (gpgme_ctx_t ctx, int synchronous, gpgme_recipients_t recp,
   if (symmetric && ctx->passphrase_cb)
     {
       /* Symmetric encryption requires a passphrase.  */
-      err = _gpgme_engine_set_command_handler (ctx->engine,
-                                              _gpgme_passphrase_command_handler,
-                                              ctx, NULL);
+      err = _gpgme_engine_set_command_handler
+       (ctx->engine, _gpgme_passphrase_command_handler, ctx, NULL);
       if (err)
        return err;
     }
@@ -178,8 +178,8 @@ encrypt_start (gpgme_ctx_t ctx, int synchronous, gpgme_recipients_t recp,
 
 
 gpgme_error_t
-gpgme_op_encrypt_start (gpgme_ctx_t ctx, gpgme_recipients_t recp, gpgme_data_t plain,
-                       gpgme_data_t cipher)
+gpgme_op_encrypt_start (gpgme_ctx_t ctx, gpgme_recipients_t recp,
+                       gpgme_data_t plain, gpgme_data_t cipher)
 {
   return encrypt_start (ctx, 0, recp, plain, cipher);
 }

diff --git a/trunk/gpgme/engine-backend.h b/trunk/gpgme/engine-backend.h
index bcf9174556dfda2f879b6c01d43be73df9bafa77..c6dbdcfb148f77d8735c1f7053b64e6c163820f8 100644 (file)
--- a/trunk/gpgme/engine-backend.h
+++ b/trunk/gpgme/engine-backend.h
@@ -40,19 +40,21 @@ struct engine_ops
   void (*set_status_handler) (void *engine, EngineStatusHandler fnc,
                              void *fnc_value);
   gpgme_error_t (*set_command_handler) (void *engine, EngineCommandHandler fnc,
-                                    void *fnc_value, gpgme_data_t data);
+                                       void *fnc_value, gpgme_data_t data);
   gpgme_error_t (*set_colon_line_handler) (void *engine,
-                                       EngineColonLineHandler fnc,
-                                       void *fnc_value);
-  gpgme_error_t (*decrypt) (void *engine, gpgme_data_t ciph, gpgme_data_t plain);
+                                          EngineColonLineHandler fnc,
+                                          void *fnc_value);
+  gpgme_error_t (*decrypt) (void *engine, gpgme_data_t ciph,
+                           gpgme_data_t plain);
   gpgme_error_t (*delete) (void *engine, gpgme_key_t key, int allow_secret);
   gpgme_error_t (*edit) (void *engine, gpgme_key_t key, gpgme_data_t out,
                         gpgme_ctx_t ctx /* FIXME */);
   gpgme_error_t (*encrypt) (void *engine, gpgme_recipients_t recp,
-                           gpgme_data_t plain, gpgme_data_t ciph, int use_armor);
+                           gpgme_data_t plain, gpgme_data_t ciph,
+                           int use_armor);
   gpgme_error_t (*encrypt_sign) (void *engine, gpgme_recipients_t recp,
-                                 gpgme_data_t plain, gpgme_data_t ciph,
-                                 int use_armor, gpgme_ctx_t ctx /* FIXME */);
+                                gpgme_data_t plain, gpgme_data_t ciph,
+                                int use_armor, gpgme_ctx_t ctx /* FIXME */);
   gpgme_error_t (*export) (void *engine, gpgme_recipients_t recp,
                           gpgme_data_t keydata, int use_armor);
   gpgme_error_t (*genkey) (void *engine, gpgme_data_t help_data, int use_armor,
@@ -61,13 +63,15 @@ struct engine_ops
   gpgme_error_t (*keylist) (void *engine, const char *pattern,
                            int secret_only, int keylist_mode);
   gpgme_error_t (*keylist_ext) (void *engine, const char *pattern[],
-                                int secret_only, int reserved,
+                               int secret_only, int reserved,
                                int keylist_mode);
   gpgme_error_t (*sign) (void *engine, gpgme_data_t in, gpgme_data_t out,
-                        gpgme_sig_mode_t mode, int use_armor, int use_textmode,
+                        gpgme_sig_mode_t mode, int use_armor,
+                        int use_textmode,
                         int include_certs, gpgme_ctx_t ctx /* FIXME */);
   gpgme_error_t (*trustlist) (void *engine, const char *pattern);
-  gpgme_error_t (*verify) (void *engine, gpgme_data_t sig, gpgme_data_t signed_text,
+  gpgme_error_t (*verify) (void *engine, gpgme_data_t sig,
+                          gpgme_data_t signed_text,
                           gpgme_data_t plaintext);
   
   void (*set_io_cbs) (void *engine, gpgme_io_cbs_t io_cbs);
@@ -81,4 +85,3 @@ extern struct engine_ops _gpgme_engine_ops_gpgsm;     /* CMS.  */
 #endif
 
 #endif /* ENGINE_BACKEND_H */
-

diff --git a/trunk/gpgme/engine-gpgsm.c b/trunk/gpgme/engine-gpgsm.c
index a068d44fcc8384dfcbf6956f034533a0b2ca8695..da9cdb4bf26d8a38422abe36f3e7e12f760688bb 100644 (file)
--- a/trunk/gpgme/engine-gpgsm.c
+++ b/trunk/gpgme/engine-gpgsm.c
@@ -411,8 +411,8 @@ gpgsm_new (void **engine)
          err = GPGME_Out_Of_Core;
          goto leave;
        }
-      err = assuan_transact (gpgsm->assuan_ctx, optstr, NULL, NULL, NULL, NULL, NULL,
-                            NULL);
+      err = assuan_transact (gpgsm->assuan_ctx, optstr, NULL, NULL, NULL,
+                            NULL, NULL, NULL);
       free (optstr);
       if (err)
        {
@@ -428,8 +428,8 @@ gpgsm_new (void **engine)
              err = GPGME_Out_Of_Core;
              goto leave;
            }
-         err = assuan_transact (gpgsm->assuan_ctx, optstr, NULL, NULL, NULL, NULL, NULL,
-                                NULL);
+         err = assuan_transact (gpgsm->assuan_ctx, optstr, NULL, NULL, NULL,
+                                NULL, NULL, NULL);
          free (optstr);
          if (err)
            {
@@ -488,8 +488,8 @@ gpgsm_new (void **engine)
            err = GPGME_Out_Of_Core;
          else
            {
-             err = assuan_transact (gpgsm->assuan_ctx, optstr, NULL, NULL, NULL, NULL, NULL,
-                                    NULL);
+             err = assuan_transact (gpgsm->assuan_ctx, optstr, NULL, NULL,
+                                    NULL, NULL, NULL, NULL);
              free (optstr);
              if (err)
                err = map_assuan_error (err);
@@ -541,7 +541,8 @@ gpgsm_new (void **engine)
 static gpgme_status_code_t parse_status (const char *name);
 
 static gpgme_error_t
-gpgsm_assuan_simple_command (ASSUAN_CONTEXT ctx, char *cmd, EngineStatusHandler status_fnc,
+gpgsm_assuan_simple_command (ASSUAN_CONTEXT ctx, char *cmd,
+                            EngineStatusHandler status_fnc,
                             void *status_fnc_value)
 {
   AssuanError err;
@@ -1271,9 +1272,9 @@ gpgsm_keylist_ext (void *engine, const char *pattern[], int secret_only,
 
 
 static gpgme_error_t
-gpgsm_sign (void *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 */)
+gpgsm_sign (void *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 */)
 {
   GpgsmObject gpgsm = engine;
   gpgme_error_t err;

diff --git a/trunk/gpgme/engine.c b/trunk/gpgme/engine.c
index fb22f15c9ebb80fe59365e6fb871b42a24741388..ed2891ee7a477643b9498b5df9981d699c01a226 100644 (file)
--- a/trunk/gpgme/engine.c
+++ b/trunk/gpgme/engine.c
@@ -248,7 +248,8 @@ gpgme_error_t _gpgme_engine_set_colon_line_handler (EngineObject engine,
 }
 
 gpgme_error_t
-_gpgme_engine_op_decrypt (EngineObject engine, gpgme_data_t ciph, gpgme_data_t plain)
+_gpgme_engine_op_decrypt (EngineObject engine, gpgme_data_t ciph,
+                         gpgme_data_t plain)
 {
   if (!engine)
     return GPGME_Invalid_Value;
@@ -260,7 +261,8 @@ _gpgme_engine_op_decrypt (EngineObject engine, gpgme_data_t ciph, gpgme_data_t p
 }
 
 gpgme_error_t
-_gpgme_engine_op_delete (EngineObject engine, gpgme_key_t key, int allow_secret)
+_gpgme_engine_op_delete (EngineObject engine, gpgme_key_t key,
+                        int allow_secret)
 {
   if (!engine)
     return GPGME_Invalid_Value;
@@ -303,8 +305,8 @@ _gpgme_engine_op_encrypt (EngineObject engine, gpgme_recipients_t recp,
 
 gpgme_error_t
 _gpgme_engine_op_encrypt_sign (EngineObject engine, gpgme_recipients_t recp,
-                              gpgme_data_t plain, gpgme_data_t ciph, int use_armor,
-                              gpgme_ctx_t ctx /* FIXME */)
+                              gpgme_data_t plain, gpgme_data_t ciph,
+                              int use_armor, gpgme_ctx_t ctx /* FIXME */)
 {
   if (!engine)
     return GPGME_Invalid_Value;
@@ -334,7 +336,8 @@ _gpgme_engine_op_export (EngineObject engine, gpgme_recipients_t recp,
 
 gpgme_error_t
 _gpgme_engine_op_genkey (EngineObject engine, gpgme_data_t help_data,
-                        int use_armor, gpgme_data_t pubkey, gpgme_data_t seckey)
+                        int use_armor, gpgme_data_t pubkey,
+                        gpgme_data_t seckey)
 {
   if (!engine)
     return GPGME_Invalid_Value;

diff --git a/trunk/gpgme/engine.h b/trunk/gpgme/engine.h
index 95a9d1e71a4a2f3ff6ab357bf0752e2d84e9d522..b9a2f975197e33d1bb573f3131bf01559a91e170 100644 (file)
--- a/trunk/gpgme/engine.h
+++ b/trunk/gpgme/engine.h
@@ -26,14 +26,17 @@
 struct engine_object_s;
 typedef struct engine_object_s *EngineObject;
 
-typedef gpgme_error_t (*EngineStatusHandler) (void *priv, gpgme_status_code_t code,
-                                          char *args);
+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,
-                                           const char **result);
+typedef gpgme_error_t (*EngineCommandHandler) (void *priv,
+                                              gpgme_status_code_t code,
+                                              const char *keyword,
+                                              const char **result);
 
-gpgme_error_t _gpgme_engine_new (gpgme_protocol_t proto, EngineObject *r_engine);
+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,
@@ -45,44 +48,52 @@ gpgme_error_t _gpgme_engine_set_command_handler (EngineObject engine,
 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_data_t ciph,
-                                    gpgme_data_t plain);
+gpgme_error_t _gpgme_engine_op_decrypt (EngineObject engine,
+                                       gpgme_data_t ciph,
+                                       gpgme_data_t plain);
 gpgme_error_t _gpgme_engine_op_delete (EngineObject engine, gpgme_key_t key,
-                                   int allow_secret);
+                                      int allow_secret);
 gpgme_error_t _gpgme_engine_op_edit (EngineObject engine, gpgme_key_t key,
-                                 gpgme_data_t out, gpgme_ctx_t ctx /* FIXME */);
-gpgme_error_t _gpgme_engine_op_encrypt (EngineObject engine, gpgme_recipients_t recp,
-                                    gpgme_data_t plain, gpgme_data_t ciph,
-                                    int use_armor);
+                                    gpgme_data_t out,
+                                    gpgme_ctx_t ctx /* FIXME */);
+gpgme_error_t _gpgme_engine_op_encrypt (EngineObject engine,
+                                       gpgme_recipients_t recp,
+                                       gpgme_data_t plain, gpgme_data_t ciph,
+                                       int use_armor);
 gpgme_error_t _gpgme_engine_op_encrypt_sign (EngineObject engine,
-                                         gpgme_recipients_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_recipients_t recp,
-                                   gpgme_data_t keydata, int use_armor);
-gpgme_error_t _gpgme_engine_op_genkey (EngineObject 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_data_t keydata);
-gpgme_error_t _gpgme_engine_op_keylist (EngineObject engine, const char *pattern,
-                                    int secret_only,
-                                    int keylist_mode);
+                                            gpgme_recipients_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_recipients_t recp,
+                                      gpgme_data_t keydata, int use_armor);
+gpgme_error_t _gpgme_engine_op_genkey (EngineObject 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_data_t keydata);
+gpgme_error_t _gpgme_engine_op_keylist (EngineObject engine,
+                                       const char *pattern,
+                                       int secret_only,
+                                       int keylist_mode);
 gpgme_error_t _gpgme_engine_op_keylist_ext (EngineObject engine,
-                                        const char *pattern[],
-                                        int secret_only,
-                                        int reserved,
-                                        int keylist_mode);
+                                           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_data_t out, gpgme_sig_mode_t mode,
-                                 int use_armor, int use_textmode,
-                                 int include_certs,
-                                 gpgme_ctx_t ctx /* FIXME */);
+                                    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,
-                                      const char *pattern);
+                                         const char *pattern);
 gpgme_error_t _gpgme_engine_op_verify (EngineObject engine, gpgme_data_t sig,
-                                   gpgme_data_t signed_text,
-                                   gpgme_data_t plaintext);
+                                      gpgme_data_t signed_text,
+                                      gpgme_data_t plaintext);
 
 void _gpgme_engine_set_io_cbs (EngineObject engine,
                               gpgme_io_cbs_t io_cbs);

diff --git a/trunk/gpgme/export.c b/trunk/gpgme/export.c
index b676d906b277c590b8f83e5729159d85d697b8cc..bdefc29c7b6a6da048564c9a206e5669f040fdac 100644 (file)
--- a/trunk/gpgme/export.c
+++ b/trunk/gpgme/export.c
@@ -55,7 +55,8 @@ export_start (gpgme_ctx_t ctx, int synchronous,
 
 /* Export the keys listed in RECP into KEYDATA.  */
 gpgme_error_t
-gpgme_op_export_start (gpgme_ctx_t ctx, gpgme_recipients_t recp, gpgme_data_t keydata)
+gpgme_op_export_start (gpgme_ctx_t ctx, gpgme_recipients_t recp,
+                      gpgme_data_t keydata)
 {
   return export_start (ctx, 0, recp, keydata);
 }

diff --git a/trunk/gpgme/gpgme.c b/trunk/gpgme/gpgme.c
index ae738006741dea26ce8c88cce80564fd0fe392cf..56c16809afcc3fe68bc8bd2a34d4cc4f70ef5dde 100644 (file)
--- a/trunk/gpgme/gpgme.c
+++ b/trunk/gpgme/gpgme.c
@@ -300,7 +300,8 @@ gpgme_get_keylist_mode (gpgme_ctx_t ctx)
  *
  **/
 void
-gpgme_set_passphrase_cb (gpgme_ctx_t ctx, gpgme_passphrase_cb_t cb, void *cb_value)
+gpgme_set_passphrase_cb (gpgme_ctx_t ctx, gpgme_passphrase_cb_t cb,
+                        void *cb_value)
 {
   if (ctx)
     {
@@ -320,7 +321,8 @@ gpgme_set_passphrase_cb (gpgme_ctx_t ctx, gpgme_passphrase_cb_t cb, void *cb_val
  * to the crypto engine.
  **/
 void
-gpgme_get_passphrase_cb (gpgme_ctx_t ctx, gpgme_passphrase_cb_t *r_cb, void **r_cb_value)
+gpgme_get_passphrase_cb (gpgme_ctx_t ctx, gpgme_passphrase_cb_t *r_cb,
+                        void **r_cb_value)
 {
   if (ctx)
     {
@@ -377,7 +379,8 @@ gpgme_set_progress_cb (gpgme_ctx_t ctx, gpgme_progress_cb_t cb, void *cb_value)
  * progress indicator.
  **/
 void
-gpgme_get_progress_cb (gpgme_ctx_t ctx, gpgme_progress_cb_t *r_cb, void **r_cb_value)
+gpgme_get_progress_cb (gpgme_ctx_t ctx, gpgme_progress_cb_t *r_cb,
+                      void **r_cb_value)
 {
   if (ctx)
     {

diff --git a/trunk/gpgme/key.c b/trunk/gpgme/key.c
index 509b76f59c91299f960c7d5a0586f96f4356cde8..47ce4aa2aabe1aee653b31837e93b74d6803ea6e 100644 (file)
--- a/trunk/gpgme/key.c
+++ b/trunk/gpgme/key.c
@@ -630,7 +630,8 @@ get_keysig (gpgme_key_t key, int uid_idx, int idx)
 
 
 const char *
-gpgme_key_sig_get_string_attr (gpgme_key_t key, int uid_idx, _gpgme_attr_t what,
+gpgme_key_sig_get_string_attr (gpgme_key_t key, int uid_idx,
+                              _gpgme_attr_t what,
                               const void *reserved, int idx)
 {
   gpgme_key_sig_t certsig = get_keysig (key, uid_idx, idx);

diff --git a/trunk/gpgme/passphrase.c b/trunk/gpgme/passphrase.c
index a5bd4dd374cd760bd69c7e271715c4bb253f99f1..eac6674643229cb48e06dfae440b7e421c297fa3 100644 (file)
--- a/trunk/gpgme/passphrase.c
+++ b/trunk/gpgme/passphrase.c
@@ -51,7 +51,8 @@ release_op_data (void *hook)
 
 \f
 gpgme_error_t
-_gpgme_passphrase_status_handler (void *priv, gpgme_status_code_t code, char *args)
+_gpgme_passphrase_status_handler (void *priv, gpgme_status_code_t code,
+                                 char *args)
 {
   gpgme_ctx_t ctx = (gpgme_ctx_t) priv;
   gpgme_error_t err;

diff --git a/trunk/gpgme/posix-io.c b/trunk/gpgme/posix-io.c
index 9c571b090c4796c3199ee48f2bac04bc131472cb..6b37a44ab77b65e1f231631f33de7b4c495cef0d 100644 (file)
--- a/trunk/gpgme/posix-io.c
+++ b/trunk/gpgme/posix-io.c
@@ -233,7 +233,8 @@ _gpgme_io_spawn (const char *path, char **argv,
              if (!duped_stderr)
                if (dup2 (fd, 2) == -1)
                  {
-                   DEBUG1 ("dup2(dev/null, 2) failed: %s\n", strerror (errno));
+                   DEBUG1 ("dup2(dev/null, 2) failed: %s\n",
+                           strerror (errno));
                    _exit (8);
                  }
              close (fd);
@@ -349,7 +350,8 @@ _gpgme_io_select (struct io_select_fd_s *fds, size_t nfds, int nonblock)
 
   do
     {
-      count = _gpgme_ath_select (max_fd + 1, &readfds, &writefds, NULL, &timeout);
+      count = _gpgme_ath_select (max_fd + 1, &readfds, &writefds, NULL,
+                                &timeout);
     }
   while (count < 0 && errno == EINTR);
   if (count < 0)

diff --git a/trunk/gpgme/progress.c b/trunk/gpgme/progress.c
index b3936312d806ff6f578ce944d74c0d5dc991f71e..f18fc6e18d7d7d19c6c17c49236b8046ebdd2e8a 100644 (file)
--- a/trunk/gpgme/progress.c
+++ b/trunk/gpgme/progress.c
@@ -29,7 +29,8 @@
 
 
 gpgme_error_t
-_gpgme_progress_status_handler (void *priv, gpgme_status_code_t code, char *args)
+_gpgme_progress_status_handler (void *priv, gpgme_status_code_t code,
+                               char *args)
 {
   gpgme_ctx_t ctx = (gpgme_ctx_t) priv;
   char *p;

diff --git a/trunk/gpgme/rungpg.c b/trunk/gpgme/rungpg.c
index ff47bc8dd93905052df6de7132ae164be29a59aa..698d0ca01edc630daf6df9fd48de379188e1cb6c 100644 (file)
--- a/trunk/gpgme/rungpg.c
+++ b/trunk/gpgme/rungpg.c
@@ -1241,7 +1241,8 @@ append_args_from_signers (GpgObject gpg, gpgme_ctx_t ctx /* FIXME */)
 
 
 static gpgme_error_t
-gpg_edit (void *engine, gpgme_key_t key, gpgme_data_t out, gpgme_ctx_t ctx /* FIXME */)
+gpg_edit (void *engine, gpgme_key_t key, gpgme_data_t out,
+         gpgme_ctx_t ctx /* FIXME */)
 {
   GpgObject gpg = engine;
   gpgme_error_t err;
@@ -1334,7 +1335,8 @@ gpg_encrypt (void *engine, gpgme_recipients_t recp, gpgme_data_t plain,
 
 static gpgme_error_t
 gpg_encrypt_sign (void *engine, gpgme_recipients_t recp, gpgme_data_t plain,
-                 gpgme_data_t ciph, int use_armor, gpgme_ctx_t ctx /* FIXME */)
+                 gpgme_data_t ciph, int use_armor,
+                 gpgme_ctx_t ctx /* FIXME */)
 {
   GpgObject gpg = engine;
   gpgme_error_t err;
@@ -1527,9 +1529,9 @@ gpg_keylist_ext (void *engine, const char *pattern[], int secret_only,
 
 
 static gpgme_error_t
-gpg_sign (void *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 */)
+gpg_sign (void *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 */)
 {
   GpgObject gpg = engine;
   gpgme_error_t err;

diff --git a/trunk/gpgme/sema.h b/trunk/gpgme/sema.h
index e47646731bdbef12fc11842776f2b0492e3d9140..2c0842e1b7621f596b93a46b2eb9d98ed0b586d6 100644 (file)
--- a/trunk/gpgme/sema.h
+++ b/trunk/gpgme/sema.h
@@ -1,63 +1,66 @@
-/* sema.h -  definitions for semaphores
- *     Copyright (C) 2001 Werner Koch (dd9jn)
- *      Copyright (C) 2001 g10 Code GmbH
- *
- * This file is part of GPGME.
- *
- * GPGME is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * GPGME is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
+/* sema.h - Definitions for semaphores.
+   Copyright (C) 2000 Werner Koch (dd9jn)
+   Copyright (C) 2001, 2003 g10 Code GmbH
+
+   This file is part of GPGME.
+ 
+   GPGME is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+ 
+   GPGME is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+ 
+   You should have received a copy of the GNU General Public License
+   along with GPGME; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #ifndef SEMA_H
 #define SEMA_H
 
-struct critsect_s {
-    const char *name;
-    void *private;
+struct critsect_s
+{
+  const char *name;
+  void *private;
 };
 
 #define DEFINE_GLOBAL_LOCK(name) \
-        struct critsect_s name = { #name, NULL }
+  struct critsect_s name = { #name, NULL }
 #define DEFINE_STATIC_LOCK(name) \
-        static struct critsect_s name  = { #name, NULL }
+  static struct critsect_s name  = { #name, NULL }
 
-#define DECLARE_LOCK(name)  struct critsect_s name
-#define INIT_LOCK(a)  do { \
-                      (a).name = #a; \
-                      (a).private = NULL; \
-                    } while (0)
+#define DECLARE_LOCK(name) \
+  struct critsect_s name
+#define INIT_LOCK(a)                   \
+  do                                   \
+    {                                  \
+      (a).name = #a;                   \
+      (a).private = NULL;              \
+    }                                  \
+  while (0)
 #define DESTROY_LOCK(name) _gpgme_sema_cs_destroy (&(name))
                        
 
-#define LOCK(name)  do { \
-                         _gpgme_sema_cs_enter ( &(name) );\
-                    } while (0)
-
-#define UNLOCK(name)  do { \
-                         _gpgme_sema_cs_leave ( &(name) );\
-                    } while (0)
+#define LOCK(name)                     \
+  do                                   \
+    {                                  \
+      _gpgme_sema_cs_enter (&(name));  \
+    }                                  \
+  while (0)
 
+#define UNLOCK(name)                   \
+  do                                   \
+    {                                  \
+      _gpgme_sema_cs_leave (&(name));  \
+    }                                  \
+  while (0)
 
 void _gpgme_sema_subsystem_init (void);
-void _gpgme_sema_cs_enter ( struct critsect_s *s );
-void _gpgme_sema_cs_leave ( struct critsect_s *s );
-void _gpgme_sema_cs_destroy ( struct critsect_s *s );
-
+void _gpgme_sema_cs_enter (struct critsect_s *s);
+void _gpgme_sema_cs_leave (struct critsect_s *s);
+void _gpgme_sema_cs_destroy (struct critsect_s *s);
 
 #endif /* SEMA_H */
-
-
-
-
-

diff --git a/trunk/gpgme/sign.c b/trunk/gpgme/sign.c
index ceac1b0187f666b841e54fd88e3d110e0adb5b77..2f7da6da3b580869ec8f72c92c3e1590271644b8 100644 (file)
--- a/trunk/gpgme/sign.c
+++ b/trunk/gpgme/sign.c
@@ -244,8 +244,8 @@ _gpgme_op_sign_init_result (gpgme_ctx_t ctx)
 
 
 static gpgme_error_t
-sign_start (gpgme_ctx_t ctx, int synchronous, gpgme_data_t plain, gpgme_data_t sig,
-           gpgme_sig_mode_t mode)
+sign_start (gpgme_ctx_t ctx, int synchronous, gpgme_data_t plain,
+           gpgme_data_t sig, gpgme_sig_mode_t mode)
 {
   gpgme_error_t err;
 
@@ -268,9 +268,8 @@ sign_start (gpgme_ctx_t ctx, int synchronous, gpgme_data_t plain, gpgme_data_t s
 
   if (ctx->passphrase_cb)
     {
-      err = _gpgme_engine_set_command_handler (ctx->engine,
-                                              _gpgme_passphrase_command_handler,
-                                              ctx, NULL);
+      err = _gpgme_engine_set_command_handler
+       (ctx->engine, _gpgme_passphrase_command_handler, ctx, NULL);
       if (err)
        return err;
     }
@@ -295,7 +294,8 @@ gpgme_op_sign_start (gpgme_ctx_t ctx, gpgme_data_t plain, gpgme_data_t sig,
 
 /* Sign the plaintext PLAIN and store the signature in SIG.  */
 gpgme_error_t
-gpgme_op_sign (gpgme_ctx_t ctx, gpgme_data_t plain, gpgme_data_t sig, gpgme_sig_mode_t mode)
+gpgme_op_sign (gpgme_ctx_t ctx, gpgme_data_t plain, gpgme_data_t sig,
+              gpgme_sig_mode_t mode)
 {
   gpgme_error_t err = sign_start (ctx, 1, plain, sig, mode);
   if (!err)

diff --git a/trunk/gpgme/trustlist.c b/trunk/gpgme/trustlist.c
index 2f2ef9826155d8a3299fc8bbdf13238878a6ef7e..ddec1b2a4e284f283f9396382e458b1584acae27 100644 (file)
--- a/trunk/gpgme/trustlist.c
+++ b/trunk/gpgme/trustlist.c
@@ -121,7 +121,8 @@ trustlist_colon_handler (void *priv, char *line)
 
 
 void
-_gpgme_op_trustlist_event_cb (void *data, gpgme_event_io_t type, void *type_data)
+_gpgme_op_trustlist_event_cb (void *data, gpgme_event_io_t type,
+                             void *type_data)
 {
   gpgme_ctx_t ctx = (gpgme_ctx_t) data;
   gpgme_error_t err;

diff --git a/trunk/gpgme/verify.c b/trunk/gpgme/verify.c
index 68c6fc5e6b04c7564e9c9801bebcc444c08d1182..abd49d86404aca30fe24554845214ad17c14e513 100644 (file)
--- a/trunk/gpgme/verify.c
+++ b/trunk/gpgme/verify.c
@@ -544,8 +544,8 @@ _gpgme_op_verify_start (gpgme_ctx_t ctx, int synchronous, gpgme_data_t sig,
 /* Decrypt ciphertext CIPHER and make a signature verification within
    CTX and store the resulting plaintext in PLAIN.  */
 gpgme_error_t
-gpgme_op_verify_start (gpgme_ctx_t ctx, gpgme_data_t sig, gpgme_data_t signed_text,
-                      gpgme_data_t plaintext)
+gpgme_op_verify_start (gpgme_ctx_t ctx, gpgme_data_t sig,
+                      gpgme_data_t signed_text, gpgme_data_t plaintext)
 {
   return _gpgme_op_verify_start (ctx, 0, sig, signed_text, plaintext);
 }

diff --git a/trunk/gpgme/w32-io.c b/trunk/gpgme/w32-io.c
index 6f56438a7df85b061b1c9e7a88cbd2d6c168f730..d25b6e42fb5227007459a4b9d0f304e5c10894ad 100644 (file)
--- a/trunk/gpgme/w32-io.c
+++ b/trunk/gpgme/w32-io.c
@@ -38,12 +38,10 @@
 #include "io.h"
 
 
-/* 
- * We assume that a HANDLE can be represented by an int which should be true   
- * for all i386 systems (HANDLE is defined as void *) and these are the only
- * systems for which Windows is available.
- * Further we assume that -1 denotes an invalid handle.
- */
+/* We assume that a HANDLE can be represented by an int which should
+   be true for all i386 systems (HANDLE is defined as void *) and
+   these are the only systems for which Windows is available.  Further
+   we assume that -1 denotes an invalid handle.  */
 
 #define fd_to_handle(a)  ((HANDLE)(a))
 #define handle_to_fd(a)  ((int)(a))

diff --git a/trunk/gpgme/w32-sema.c b/trunk/gpgme/w32-sema.c
index d0c257664e822207c5c206b9957124740b47b59f..f5337bda8f6daad93a0360e34e448a7f6c9651a8 100644 (file)
--- a/trunk/gpgme/w32-sema.c
+++ b/trunk/gpgme/w32-sema.c
@@ -52,9 +52,9 @@ critsect_init (struct critsect_s *s)
     static int initialized;
     
     if (!initialized) {
-        /* the very first time we call this function, we assume that only
-         * one thread is running, so that we can bootstrap the semaphore code 
-         */
+        /* The very first time we call this function, we assume that
+          only one thread is running, so that we can bootstrap the
+          semaphore code.  */
         InitializeCriticalSection (&init_lock);
         initialized = 1;
     }
@@ -99,7 +99,7 @@ _gpgme_sema_cs_leave (struct critsect_s *s)
 {
     if (!s->private)
         critsect_init (s);
-    LeaveCriticalSection ( (CRITICAL_SECTION*)s->private );
+    LeaveCriticalSection ((CRITICAL_SECTION*)s->private);
 }
 
 void

diff --git a/trunk/gpgme/wait-global.c b/trunk/gpgme/wait-global.c
index 02b90b5f10f4d2a21816212d848a906939b9d88f..76dbc2d756bc90700ba16b2afff535723a8eecd9 100644 (file)
--- a/trunk/gpgme/wait-global.c
+++ b/trunk/gpgme/wait-global.c
@@ -184,7 +184,8 @@ ctx_wait (gpgme_ctx_t ctx, gpgme_error_t *status)
    event loops.  */
 
 void
-_gpgme_wait_global_event_cb (void *data, gpgme_event_io_t type, void *type_data)
+_gpgme_wait_global_event_cb (void *data, gpgme_event_io_t type,
+                            void *type_data)
 {
   gpgme_ctx_t ctx = (gpgme_ctx_t) data;
 
@@ -315,7 +316,8 @@ gpgme_wait (gpgme_ctx_t ctx, gpgme_error_t *status, int hang)
                  for (idx = 0; idx < ictx->fdt.size; idx++)
                    if (ictx->fdt.fds[idx].fd != -1)
                      _gpgme_io_close (ictx->fdt.fds[idx].fd);
-                 _gpgme_engine_io_event (ictx->engine, GPGME_EVENT_DONE, &err);
+                 _gpgme_engine_io_event (ictx->engine, GPGME_EVENT_DONE,
+                                         &err);
                }
            }
        }

diff --git a/trunk/gpgme/wait-private.c b/trunk/gpgme/wait-private.c
index af27a9bf4e749859c6ff0cf61a9f25b681d82198..9d7681d09d33201a6204cf4a42e1c7c72cb0f023 100644 (file)
--- a/trunk/gpgme/wait-private.c
+++ b/trunk/gpgme/wait-private.c
@@ -42,7 +42,8 @@
    event loops.  */
 
 void
-_gpgme_wait_private_event_cb (void *data, gpgme_event_io_t type, void *type_data)
+_gpgme_wait_private_event_cb (void *data, gpgme_event_io_t type,
+                             void *type_data)
 {
   switch (type)
     {

diff --git a/trunk/gpgme/wait.h b/trunk/gpgme/wait.h
index 6f61fb16e4bc2a4b7c8405d55e3bb7d3bced3b6b..9cc17226da1eb5e400e479a9a6312576c78bc1ab 100644 (file)
--- a/trunk/gpgme/wait.h
+++ b/trunk/gpgme/wait.h
@@ -62,14 +62,17 @@ void _gpgme_fd_table_deinit (fd_table_t fdt);
 gpgme_error_t _gpgme_add_io_cb (void *data, int fd, int dir,
                             gpgme_io_cb_t fnc, void *fnc_data, void **r_tag);
 void _gpgme_remove_io_cb (void *tag);
-void _gpgme_wait_private_event_cb (void *data, gpgme_event_io_t type, void *type_data);
-void _gpgme_wait_global_event_cb (void *data, gpgme_event_io_t type, void *type_data);
+void _gpgme_wait_private_event_cb (void *data, gpgme_event_io_t type,
+                                  void *type_data);
+void _gpgme_wait_global_event_cb (void *data, gpgme_event_io_t type,
+                                 void *type_data);
 
 gpgme_error_t _gpgme_wait_user_add_io_cb (void *data, int fd, int dir,
                                          gpgme_io_cb_t fnc, void *fnc_data,
                                          void **r_tag);
 void _gpgme_wait_user_remove_io_cb (void *tag);
-void _gpgme_wait_user_event_cb (void *data, gpgme_event_io_t type, void *type_data);
+void _gpgme_wait_user_event_cb (void *data, gpgme_event_io_t type,
+                               void *type_data);
 
 gpgme_error_t _gpgme_wait_one (gpgme_ctx_t ctx);