Mercurial > emacs
comparison src/gnutls.c @ 112434:9de5a68b57e1
Promote SSDATA macro from gtkutil.c and xsmfns.c to lisp.h.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Sat, 22 Jan 2011 18:56:06 -0800 |
| parents | 6378d1b57038 |
| children |
comparison
equal
deleted
inserted
replaced
| 112433:7b649f6eac4f | 112434:9de5a68b57e1 |
|---|---|
| 446 SDATA (trustfile)); | 446 SDATA (trustfile)); |
| 447 ret = gnutls_certificate_set_x509_trust_file | 447 ret = gnutls_certificate_set_x509_trust_file |
| 448 (x509_cred, | 448 (x509_cred, |
| 449 SDATA (trustfile), | 449 SDATA (trustfile), |
| 450 file_format); | 450 file_format); |
| 451 | 451 |
| 452 if (ret < GNUTLS_E_SUCCESS) | 452 if (ret < GNUTLS_E_SUCCESS) |
| 453 return gnutls_make_error (ret); | 453 return gnutls_make_error (ret); |
| 454 } | 454 } |
| 455 else | 455 else |
| 456 { | 456 { |
| 468 SDATA (keyfile)); | 468 SDATA (keyfile)); |
| 469 ret = gnutls_certificate_set_x509_crl_file | 469 ret = gnutls_certificate_set_x509_crl_file |
| 470 (x509_cred, | 470 (x509_cred, |
| 471 SDATA (keyfile), | 471 SDATA (keyfile), |
| 472 file_format); | 472 file_format); |
| 473 | 473 |
| 474 if (ret < GNUTLS_E_SUCCESS) | 474 if (ret < GNUTLS_E_SUCCESS) |
| 475 return gnutls_make_error (ret); | 475 return gnutls_make_error (ret); |
| 476 } | 476 } |
| 477 else | 477 else |
| 478 { | 478 { |
| 495 | 495 |
| 496 GNUTLS_INITSTAGE (proc) = GNUTLS_STAGE_INIT; | 496 GNUTLS_INITSTAGE (proc) = GNUTLS_STAGE_INIT; |
| 497 | 497 |
| 498 if (STRINGP (priority_string)) | 498 if (STRINGP (priority_string)) |
| 499 { | 499 { |
| 500 priority_string_ptr = (char*) SDATA (priority_string); | 500 priority_string_ptr = SSDATA (priority_string); |
| 501 GNUTLS_LOG2 (1, max_log_level, "got non-default priority string:", | 501 GNUTLS_LOG2 (1, max_log_level, "got non-default priority string:", |
| 502 priority_string_ptr); | 502 priority_string_ptr); |
| 503 } | 503 } |
| 504 else | 504 else |
| 505 { | 505 { |
| 506 GNUTLS_LOG2 (1, max_log_level, "using default priority string:", | 506 GNUTLS_LOG2 (1, max_log_level, "using default priority string:", |
| 507 priority_string_ptr); | 507 priority_string_ptr); |
| 508 } | 508 } |
| 509 | 509 |
| 510 GNUTLS_LOG (1, max_log_level, "setting the priority string"); | 510 GNUTLS_LOG (1, max_log_level, "setting the priority string"); |
| 511 | 511 |
| 512 ret = gnutls_priority_set_direct (state, | 512 ret = gnutls_priority_set_direct (state, |
| 513 priority_string_ptr, | 513 priority_string_ptr, |
| 514 NULL); | 514 NULL); |