projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gio: Fix regression encoding an array of doubles
[platform/upstream/glib.git]
/
gio
/
gtlscertificate.c
diff --git
a/gio/gtlscertificate.c
b/gio/gtlscertificate.c
index
af555cd
..
47de03d
100644
(file)
--- a/
gio/gtlscertificate.c
+++ b/
gio/gtlscertificate.c
@@
-320,7
+320,7
@@
parse_next_pem_certificate (const gchar **data,
* If @data includes multiple certificates, only the first one will be
* parsed.
*
* If @data includes multiple certificates, only the first one will be
* parsed.
*
- * Return
value
: the new certificate, or %NULL if @data is invalid
+ * Return
s
: the new certificate, or %NULL if @data is invalid
*
* Since: 2.28
*/
*
* Since: 2.28
*/
@@
-368,7
+368,7
@@
g_tls_certificate_new_from_pem (const gchar *data,
* set @error. Otherwise, this behaves like
* g_tls_certificate_new_from_pem().
*
* set @error. Otherwise, this behaves like
* g_tls_certificate_new_from_pem().
*
- * Return
value
: the new certificate, or %NULL on error
+ * Return
s
: the new certificate, or %NULL on error
*
* Since: 2.28
*/
*
* Since: 2.28
*/
@@
-399,7
+399,7
@@
g_tls_certificate_new_from_file (const gchar *file,
* function will return %NULL and set @error. Otherwise, this behaves
* like g_tls_certificate_new_from_pem().
*
* function will return %NULL and set @error. Otherwise, this behaves
* like g_tls_certificate_new_from_pem().
*
- * Return
value
: the new certificate, or %NULL on error
+ * Return
s
: the new certificate, or %NULL on error
*
* Since: 2.28
*/
*
* Since: 2.28
*/
@@
-452,7
+452,7
@@
g_tls_certificate_new_from_files (const gchar *cert_file,
* PEM-encoded certificates, this will return an empty list and not
* set @error.
*
* PEM-encoded certificates, this will return an empty list and not
* set @error.
*
- * Return
value
: (element-type Gio.TlsCertificate) (transfer full): a
+ * Return
s
: (element-type Gio.TlsCertificate) (transfer full): a
* #GList containing #GTlsCertificate objects. You must free the list
* and its contents when you are done with it.
*
* #GList containing #GTlsCertificate objects. You must free the list
* and its contents when you are done with it.
*
@@
-476,19
+476,24
@@
g_tls_certificate_list_new_from_file (const gchar *file,
{
gchar *cert_pem;
GTlsCertificate *cert = NULL;
{
gchar *cert_pem;
GTlsCertificate *cert = NULL;
+ GError *parse_error = NULL;
- cert_pem = parse_next_pem_certificate (&p, end, FALSE, error);
+ cert_pem = parse_next_pem_certificate (&p, end, FALSE,
&parse_
error);
if (cert_pem)
if (cert_pem)
- {
-
cert = g_tls_certificate_new_internal (cert_pem, NULL,
error);
- g_free (cert_pem);
- }
+
{
+
cert = g_tls_certificate_new_internal (cert_pem, NULL, &parse_
error);
+
g_free (cert_pem);
+
}
if (!cert)
if (!cert)
- {
- g_list_free_full (queue.head, g_object_unref);
- queue.head = NULL;
- break;
- }
+ {
+ if (parse_error)
+ {
+ g_propagate_error (error, parse_error);
+ g_list_free_full (queue.head, g_object_unref);
+ queue.head = NULL;
+ }
+ break;
+ }
g_queue_push_tail (&queue, cert);
}
g_queue_push_tail (&queue, cert);
}
@@
-503,7
+508,7
@@
g_tls_certificate_list_new_from_file (const gchar *file,
*
* Gets the #GTlsCertificate representing @cert's issuer, if known
*
*
* Gets the #GTlsCertificate representing @cert's issuer, if known
*
- * Return
value
: (transfer none): The certificate of @cert's issuer,
+ * Return
s
: (transfer none): The certificate of @cert's issuer,
* or %NULL if @cert is self-signed or signed with an unknown
* certificate.
*
* or %NULL if @cert is self-signed or signed with an unknown
* certificate.
*
@@
-547,7
+552,7
@@
g_tls_certificate_get_issuer (GTlsCertificate *cert)
* (All other #GTlsCertificateFlags values will always be set or unset
* as appropriate.)
*
* (All other #GTlsCertificateFlags values will always be set or unset
* as appropriate.)
*
- * Return
value
: the appropriate #GTlsCertificateFlags
+ * Return
s
: the appropriate #GTlsCertificateFlags
*
* Since: 2.28
*/
*
* Since: 2.28
*/
@@
-570,7
+575,7
@@
g_tls_certificate_verify (GTlsCertificate *cert,
* their #GTlsCertificate:issuer, #GTlsCertificate:private-key, or
* #GTlsCertificate:private-key-pem properties differ.
*
* their #GTlsCertificate:issuer, #GTlsCertificate:private-key, or
* #GTlsCertificate:private-key-pem properties differ.
*
- * Return
value
: whether the same or not
+ * Return
s
: whether the same or not
*
* Since: 2.34
*/
*
* Since: 2.34
*/