diff options
author | Mikael Hallendal <micke@codefactory.se> | 2002-05-26 23:36:08 +0000 |
---|---|---|
committer | Mikael Hallendal <hallski@src.gnome.org> | 2002-05-26 23:36:08 +0000 |
commit | 3d2bdf24cc1b90b3e85bad52b5b096e7588a102c (patch) | |
tree | 5617205a8cfe97de70428e42b5b5d3605db89755 | |
parent | e843d47e5074412b6f93a7d8ebb278a8c0a552b3 (diff) | |
download | yelp-3d2bdf24cc1b90b3e85bad52b5b096e7588a102c.tar.gz |
- removed old code. - fixed a couple of warnings
2002-05-27 Mikael Hallendal <micke@codefactory.se>
* src/yelp-reader.c:
- removed old code.
- fixed a couple of warnings
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | src/yelp-reader.c | 139 |
2 files changed, 11 insertions, 132 deletions
@@ -1,5 +1,9 @@ 2002-05-27 Mikael Hallendal <micke@codefactory.se> + * src/yelp-reader.c: + - removed old code. + - fixed a couple of warnings + * stylesheets/yelp-customization.xsl: don't include section names on toc and title-page. diff --git a/src/yelp-reader.c b/src/yelp-reader.c index c8bfdf6d..160bfba4 100644 --- a/src/yelp-reader.c +++ b/src/yelp-reader.c @@ -73,15 +73,7 @@ typedef struct { static void reader_class_init (YelpReaderClass *klass); static void reader_init (YelpReader *reader); -#if 0 -static void reader_db_start (ReaderThreadData *th_data); -static gint reader_db_write (ReaderThreadData *th_data, - const gchar *buffer, - gint len); -static gint reader_db_close (ReaderThreadData *th_data); -#endif - -static void reader_man_info_start (ReaderThreadData *th_data); +static void reader_convert_start (ReaderThreadData *th_data); static void reader_file_start (ReaderThreadData *th_data); @@ -89,7 +81,7 @@ static gboolean reader_check_cancelled (YelpReader *reader, gint stamp); static gpointer reader_start (ReaderThreadData *th_data); static void reader_change_stamp (YelpReader *reader); -static gboolean reader_idle_check_queue (ReaderThreadData *th_data); +static gboolean reader_idle_check_queue (ReaderThreadData *th_data); static ReaderQueueData * reader_q_data_new (YelpReader *reader, @@ -213,125 +205,8 @@ reader_init (YelpReader *reader) priv->thread_queue = g_async_queue_new (); } -#if 0 -static void -reader_db_start (ReaderThreadData *th_data) -{ - YelpReader *reader; - YelpReaderPriv *priv; - xmlOutputBufferPtr buf; - ReaderQueueData *q_data; - GError *error = NULL; - - g_return_if_fail (th_data != NULL); - - reader = th_data->reader; - priv = reader->priv; - - STAMP_MUTEX_LOCK; - - if (reader_check_cancelled (reader, th_data->stamp)) { - - STAMP_MUTEX_UNLOCK; - - return; - } - - STAMP_MUTEX_UNLOCK; - - q_data = reader_q_data_new (reader, th_data->stamp, - READER_QUEUE_TYPE_START); - - g_async_queue_push (priv->thread_queue, q_data); - - buf = xmlAllocOutputBuffer (NULL); - - buf->writecallback = (xmlOutputWriteCallback) reader_db_write; - buf->closecallback = (xmlOutputCloseCallback) reader_db_close; - buf->context = th_data; - - yelp_db2html_convert (th_data->uri, buf, &error); - - xmlOutputBufferClose (buf); -} - -static int -reader_db_write (ReaderThreadData *th_data, const gchar *buffer, gint len) -{ - YelpReader *reader; - YelpReaderPriv *priv; - ReaderQueueData *q_data; - - g_return_val_if_fail (th_data != NULL, -1); - - reader = th_data->reader; - priv = reader->priv; - - d(g_print ("reader_db_write: %d\n", len)); - - STAMP_MUTEX_LOCK; - - if (reader_check_cancelled (reader, th_data->stamp)) { - - STAMP_MUTEX_UNLOCK; - - return 0; - } - - STAMP_MUTEX_UNLOCK; - - if (len <= 0) { - return 0; - } - - g_print ("------------------------------------------\n"); - - g_print ("%s\n", buffer); - - q_data = reader_q_data_new (reader, th_data->stamp, - READER_QUEUE_TYPE_DATA); - - q_data->data = g_strndup (buffer, len); - - g_async_queue_push (priv->thread_queue, q_data); - - return len; -} - -static int -reader_db_close (ReaderThreadData *th_data) -{ - YelpReader *reader; - YelpReaderPriv *priv; - ReaderQueueData *q_data; - - g_return_val_if_fail (th_data != NULL, -1); - - reader = th_data->reader; - priv = reader->priv; - - STAMP_MUTEX_LOCK; - - if (reader_check_cancelled (reader, th_data->stamp)) { - - STAMP_MUTEX_UNLOCK; - - return 0; - } - - STAMP_MUTEX_UNLOCK; - - q_data = reader_q_data_new (reader, th_data->stamp, - READER_QUEUE_TYPE_FINISHED); - - g_async_queue_push (priv->thread_queue, q_data); - - return 0; -} -#endif - static void -reader_man_info_start (ReaderThreadData *th_data) +reader_convert_start (ReaderThreadData *th_data) { YelpReader *reader; YelpReaderPriv *priv; @@ -349,7 +224,7 @@ reader_man_info_start (ReaderThreadData *th_data) uri = th_data->uri; stamp = th_data->stamp; - d(g_print ("man_info_start\n")); + d(g_print ("convert_start\n")); STAMP_MUTEX_LOCK; @@ -590,7 +465,7 @@ reader_start (ReaderThreadData *th_data) case YELP_URI_TYPE_DOCBOOK_SGML: case YELP_URI_TYPE_MAN: case YELP_URI_TYPE_INFO: - reader_man_info_start (th_data); + reader_convert_start (th_data); break; case YELP_URI_TYPE_HTML: reader_file_start (th_data); @@ -849,8 +724,8 @@ yelp_reader_start (YelpReader *reader, YelpURI *uri) ReaderThreadData *th_data; gint stamp; - g_return_if_fail (YELP_IS_READER (reader)); - g_return_if_fail (uri != NULL); + g_return_val_if_fail (YELP_IS_READER (reader), FALSE); + g_return_val_if_fail (uri != NULL, FALSE); priv = reader->priv; |