# HG changeset patch
# User William Ehlhardt <williamehlhardt@gmail.com>
# Date 1187578831 0
# Node ID 4f472eef762c8e96977903ba5fe1f384760c9522
# Parent  79dbe5fc20978c6d3d4252c368764685adccdd72
- TODO-whacking

diff -r 79dbe5fc2097 -r 4f472eef762c libpurple/plugins/ssl/ssl-gnutls.c
--- a/libpurple/plugins/ssl/ssl-gnutls.c	Mon Aug 20 02:49:47 2007 +0000
+++ b/libpurple/plugins/ssl/ssl-gnutls.c	Mon Aug 20 03:00:31 2007 +0000
@@ -361,8 +361,7 @@
 	return s;
 }
 
-/* Forward declarations are fun!
-   TODO: This is a stupid place for this */
+/* Forward declarations are fun! */
 static PurpleCertificate *
 x509_import_from_datum(const gnutls_datum_t dt, gnutls_x509_crt_fmt_t mode);
 
@@ -398,8 +397,7 @@
 		peer_certs = g_list_append(peer_certs, newcrt);
 	}
 
-	/* cert_list shouldn't need free()-ing */
-	/* TODO: double-check this */
+	/* cert_list doesn't need free()-ing */
 
 	return peer_certs;
 }
@@ -501,12 +499,13 @@
 	/* Next, we'll simply yank the entire contents of the file
 	   into memory */
 	/* TODO: Should I worry about very large files here? */
-	/* TODO: Error checking */
-	g_file_get_contents(filename,
+	g_return_val_if_fail(
+		g_file_get_contents(filename,
 			    &buf,
 			    &buf_sz,
 			    NULL      /* No error checking for now */
-		);
+		),
+		NULL);
 	
 	/* Load the datum struct */
 	dt.data = (unsigned char *) buf;