/[winpt]/trunk/MyGPGME/encrypt.c
ViewVC logotype

Diff of /trunk/MyGPGME/encrypt.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2 by twoaday, Mon Jan 31 11:02:21 2005 UTC revision 21 by twoaday, Wed Jul 27 11:17:44 2005 UTC
# Line 77  add_recp_info( _encrypt_result_t res, in Line 77  add_recp_info( _encrypt_result_t res, in
77    
78    
79  void  void
80  _gpgme_release_encrypt_result( _encrypt_result_t res )  _gpgme_release_encrypt_result (_encrypt_result_t res)
81  {      {    
82      struct recp_info_s * r, * r2;      struct recp_info_s * r, * r2;
83    
84      if( !res )      if (!res)
85          return;          return;
86      r = res->inf;      r = res->inf;
87      while( r ) {      while (r) {
88          r2 = r->next;          r2 = r->next;
89          safe_free( r );          safe_free (r);
90          r = r2;          r = r2;
91      }      }
92      safe_free( res->inf );      safe_free (res->inf);
93      safe_free( res );      safe_free (res);
94  } /* _gpgme_release_encrypt_result */  } /* _gpgme_release_encrypt_result */
95    
96    
# Line 133  encrypt_status_handler( gpgme_ctx_t ctx, Line 133  encrypt_status_handler( gpgme_ctx_t ctx,
133      int i = 0;      int i = 0;
134      gpgme_error_t err;      gpgme_error_t err;
135    
136      if( ctx->out_of_core )      if (ctx->out_of_core)
137          return;          return;
138            
139      if( ctx->result_type == RESULT_TYPE_NONE ) {      if( ctx->result_type == RESULT_TYPE_NONE ) {
# Line 210  encrypt_start( gpgme_ctx_t ctx, gpgme_re Line 210  encrypt_start( gpgme_ctx_t ctx, gpgme_re
210  {  {
211      gpgme_error_t rc = 0;      gpgme_error_t rc = 0;
212            
213      fail_on_pending_request( ctx );      fail_on_pending_request (ctx);
214      ctx->pending = 1;      ctx->pending = 1;
215            
216      /* do some checks */          /* do some checks */    
# Line 220  encrypt_start( gpgme_ctx_t ctx, gpgme_re Line 220  encrypt_start( gpgme_ctx_t ctx, gpgme_re
220      }      }
221            
222      /* create a process object */      /* create a process object */
223      _gpgme_gpg_release( &ctx->gpg );      _gpgme_gpg_release (&ctx->gpg);
224      rc = _gpgme_gpg_new( &ctx->gpg );      rc = _gpgme_gpg_new (&ctx->gpg);
225      if( rc )      if (rc)
226          goto leave;          goto leave;
227            
228      _gpgme_gpg_set_status_handler (ctx->gpg, encrypt_status_handler, ctx);      _gpgme_gpg_set_status_handler (ctx->gpg, encrypt_status_handler, ctx);
# Line 369  file_encrypt_start( gpgme_ctx_t ctx, gpg Line 369  file_encrypt_start( gpgme_ctx_t ctx, gpg
369    
370    
371  static gpgme_error_t  static gpgme_error_t
372  get_encrypt_result( gpgme_ctx_t ctx )  get_encrypt_result (gpgme_ctx_t ctx)
373  {  {
374      struct encrypt_result_s * res;      struct encrypt_result_s * res;
375      gpgme_error_t err = 0;      gpgme_error_t err = 0;
376      int rc;      int rc;
377    
378      assert( ctx->result.encrypt );      assert (ctx->result.encrypt);
379      res = ctx->result.encrypt;      res = ctx->result.encrypt;
380      if( res->okay )      if (res->okay)
381          return mk_error( No_Error );          return mk_error( No_Error );
382      if( res->no_recp )      if (res->no_recp)
383          err = mk_error( No_Recipients );          err = mk_error (No_Recipients);
384      else if( res->inv_recp )      else if (res->inv_recp)
385          err = mk_error( Inv_Recipients );          err = mk_error (Inv_Recipients);
386      else if( (rc = gpgme_get_process_rc( ctx )) ) {      else if ((rc = gpgme_get_process_rc (ctx )) != 0) {
387          DEBUG1( "gpg return code=%d\n", rc );          DEBUG1 ("gpg return code=%d\n", rc);
388          err = mk_error( Interal_GPG_Problem );          err = mk_error (Internal_GPG_Problem);
389      }      }
390      else if( !res->okay || (res->file_start != res->file_done) )      else if (!res->okay || (res->file_start != res->file_done))
391          err = mk_error( Encryption_Failed );          err = mk_error (Encryption_Failed);
392      return err;      return err;
393  } /* get_encrypt_result */  } /* get_encrypt_result */
394    

Legend:
Removed from v.2  
changed lines
  Added in v.21

[email protected]
ViewVC Help
Powered by ViewVC 1.1.26