[Opensync-commits] r1148 - trunk/libsyncml

[<svn...@op...>]

Author: bellmich
Date: Fri Jul  3 15:10:54 2009
New Revision: 1148
URL: http://libsyncml.opensync.org/changeset/1148

Log:
migrate sml_queue from SmlError to GError

Modified:
   trunk/libsyncml/sml_queue.c
   trunk/libsyncml/sml_queue_internals.h

Modified: trunk/libsyncml/sml_queue.c
==============================================================================
--- trunk/libsyncml/sml_queue.c	Fri Jul  3 15:03:14 2009	(r1147)
+++ trunk/libsyncml/sml_queue.c	Fri Jul  3 15:10:54 2009	(r1148)
@@ -27,7 +27,9 @@
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 
-static gboolean _queue_prepare(GSource *source, gint *timeout_)
+static gboolean
+_queue_prepare (GSource *source,
+                gint *timeout_)
 {
 	smlTrace(TRACE_INTERNAL, "%s(%p, %p)", __func__, source, timeout_);
 	*timeout_ = 1;
@@ -35,7 +37,8 @@
 }
 
 /* TODO only use me for debugging */
-void smlQueueAssert(SmlQueue *queue)
+void
+smlQueueAssert (SmlQueue *queue)
 {
 	if (queue->tail) {
 		smlAssert(queue->head);
@@ -54,13 +57,17 @@
 	smlAssert(g_list_last(queue->head) == queue->tail);
 }
 
-static gboolean _queue_check(GSource *source)
+static gboolean
+_queue_check (GSource *source)
 {
 	SmlQueue *queue = *((SmlQueue **)(source + 1));
 	return smlQueueCheck(queue);
 }
 
-static gboolean _queue_dispatch(GSource *source, GSourceFunc callback, gpointer user_data)
+static gboolean
+_queue_dispatch (GSource *source,
+                 GSourceFunc callback,
+                 gpointer user_data)
 {
 	smlTrace(TRACE_INTERNAL, "%s(%p, %p, %p)", __func__, source, callback, user_data);
 	SmlQueue *queue = user_data;
@@ -78,7 +85,8 @@
  * This function return the pointer to a newly created SmlQueue
  * 
  */
-SmlQueue *smlQueueNew(SmlError **error)
+SmlQueue*
+smlQueueNew (GError **error)
 {
 	CHECK_ERROR_REF
 	SmlQueue *queue = smlTryMalloc0(sizeof(SmlQueue), error);
@@ -92,7 +100,8 @@
 	return queue;
 }
 
-void smlQueueFree(SmlQueue *queue)
+void
+smlQueueFree (SmlQueue *queue)
 {
 	if (queue->source)
 		smlQueueDetach(queue);
@@ -105,7 +114,8 @@
 	smlSafeFree((gpointer *)&queue);
 }
 
-void smlQueueFlush(SmlQueue *queue)
+void
+smlQueueFlush (SmlQueue *queue)
 {
 	g_mutex_lock(queue->mutex);
 	
@@ -121,7 +131,8 @@
 	g_mutex_unlock(queue->mutex);
 }
 
-SmlBool smlQueueCheckPrio(SmlQueue *queue)
+gboolean
+smlQueueCheckPrio (SmlQueue *queue)
 {
 	g_mutex_lock(queue->mutex);
 	SmlBool ret = (queue->prio == NULL) ? FALSE : TRUE;
@@ -130,7 +141,8 @@
 	return ret;
 }
 
-SmlBool smlQueueCheck(SmlQueue *queue)
+gboolean
+smlQueueCheck (SmlQueue *queue)
 {
 	g_mutex_lock(queue->mutex);
 	SmlBool ret = (queue->head == NULL) ? FALSE : TRUE;
@@ -139,7 +151,8 @@
 	return ret;
 }
 
-unsigned int smlQueueLength(SmlQueue *queue)
+gsize
+smlQueueLength (SmlQueue *queue)
 {
 	g_mutex_lock(queue->mutex);
 	unsigned int ret = g_list_length(queue->head);
@@ -148,7 +161,8 @@
 	return ret;
 }
 
-unsigned int smlQueueLengthPrio(SmlQueue *queue)
+gsize
+smlQueueLengthPrio (SmlQueue *queue)
 {
 	g_mutex_lock(queue->mutex);
 	unsigned int ret = g_list_length(queue->prio);
@@ -157,7 +171,8 @@
 	return ret;
 }
 
-void *smlQueueTryPop(SmlQueue *queue)
+void*
+smlQueueTryPop (SmlQueue *queue)
 {
 	smlAssert(queue);
 	void *message = NULL;
@@ -182,7 +197,8 @@
 	return message;
 }
 
-void *smlQueueTryPopPrio(SmlQueue *queue)
+void*
+smlQueueTryPopPrio (SmlQueue *queue)
 {
 	smlAssert(queue);
 	void *message = NULL;
@@ -206,25 +222,29 @@
 	return message;
 }
 
-void smlQueueLock(SmlQueue *queue)
+void
+smlQueueLock (SmlQueue *queue)
 {
 	smlAssert(queue);
 	g_mutex_lock(queue->mutex);
 }
 
-void smlQueueUnlock(SmlQueue *queue)
+void
+smlQueueUnlock (SmlQueue *queue)
 {
 	smlAssert(queue);
 	g_mutex_unlock(queue->mutex);
 }
 
-void *smlQueuePeek(SmlQueue *queue)
+void*
+smlQueuePeek (SmlQueue *queue)
 {
 	smlAssert(queue);
 	return queue->head ? queue->head->data : NULL;
 }
 
-void *smlQueuePeekPrio(SmlQueue *queue)
+void*
+smlQueuePeekPrio (SmlQueue *queue)
 {
 	smlAssert(queue);
 	void *message = NULL;
@@ -240,7 +260,8 @@
 	return message;
 }
 
-void smlQueuePrint(SmlQueue *queue)
+void
+smlQueuePrint (SmlQueue *queue)
 {
 	smlAssert(queue);
 	
@@ -267,7 +288,9 @@
 	g_mutex_unlock(queue->mutex);
 }
 
-GList *smlQueuePeekNext(SmlQueue *queue, GList *prev)
+GList*
+smlQueuePeekNext (SmlQueue *queue,
+                  GList *prev)
 {
 	smlAssert(queue);
 	
@@ -277,7 +300,9 @@
 		return prev->next;
 }
 
-void smlQueuePushHeadPrio(SmlQueue *queue, void *data)
+void
+smlQueuePushHeadPrio (SmlQueue *queue,
+                      void *data)
 {
 	smlAssert(queue);
 	smlAssert(data);
@@ -296,7 +321,9 @@
 	g_mutex_unlock(queue->mutex);
 }
 
-void smlQueuePushHead(SmlQueue *queue, void *data)
+void
+smlQueuePushHead (SmlQueue *queue,
+                  void *data)
 {
 	smlAssert(queue);
 	smlAssert(data);
@@ -320,7 +347,9 @@
  * @param message The message to send
  * 
  */
-void smlQueueSendPrio(SmlQueue *queue, void *data)
+void
+smlQueueSendPrio (SmlQueue *queue,
+                  void *data)
 {
 	smlAssert(queue);
 	smlAssert(data);
@@ -350,7 +379,9 @@
  * @param message The message to send
  * 
  */
-void smlQueueSend(SmlQueue *queue, void *data)
+void
+smlQueueSend (SmlQueue *queue,
+              void *data)
 {
 	smlAssert(queue);
 	smlAssert(data);
@@ -381,7 +412,10 @@
  * @param user_data The userdata that the message handler should receive
  * 
  */
-void smlQueueSetHandler(SmlQueue *queue, SmlQueueHandler handler, void *userdata)
+void
+smlQueueSetHandler (SmlQueue *queue,
+                    SmlQueueHandler handler,
+                    void *userdata)
 {
 	queue->handler = handler;
 	queue->userdata = userdata;
@@ -397,7 +431,9 @@
  * @param context The context to use. NULL for default loop
  * 
  */
-void smlQueueAttach(SmlQueue *queue, GMainContext *context)
+void
+smlQueueAttach (SmlQueue *queue,
+                GMainContext *context)
 {
 	smlTrace(TRACE_ENTRY, "%s(%p, %p)", __func__, queue, context);
 	
@@ -424,7 +460,8 @@
 	smlTrace(TRACE_EXIT, "%s", __func__);
 }
 
-void smlQueueDetach(SmlQueue *queue)
+void
+smlQueueDetach (SmlQueue *queue)
 {
 	smlTrace(TRACE_ENTRY, "%s(%p)", __func__, queue);
 	
@@ -446,19 +483,22 @@
 	smlTrace(TRACE_EXIT, "%s", __func__);
 }
 
-SmlBool smlQueueIsAttached(SmlQueue *queue)
+gboolean
+smlQueueIsAttached (SmlQueue *queue)
 {
 	return queue->source ? TRUE : FALSE;
 }
 
-void smlQueueDispatch(SmlQueue *queue)
+void
+smlQueueDispatch (SmlQueue *queue)
 {
 	void *message = smlQueueTryPop(queue);
 	if (message)
 		queue->handler(message, queue->userdata);
 }
 
-void smlQueueDispatchPrio(SmlQueue *queue)
+void
+smlQueueDispatchPrio (SmlQueue *queue)
 {
 	
 	void *message = smlQueueTryPopPrio(queue);

Modified: trunk/libsyncml/sml_queue_internals.h
==============================================================================
--- trunk/libsyncml/sml_queue_internals.h	Fri Jul  3 15:03:14 2009	(r1147)
+++ trunk/libsyncml/sml_queue_internals.h	Fri Jul  3 15:10:54 2009	(r1148)
@@ -1,6 +1,7 @@
 /*
  * libsyncml - A syncml protocol implementation
  * Copyright (C) 2005  Armin Bauer <arm...@op...>
+ * Copyright (C) 2009  Michael Bell <mic...@op...>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -51,31 +52,31 @@
 	GMutex *mutex;
 } SmlQueue;
 
-SmlQueue *smlQueueNew(GError **error);
-void smlQueueFree(SmlQueue *queue);
-void smlQueueFlush(SmlQueue *queue);
-void smlQueueSetHandler(SmlQueue *queue, SmlQueueHandler handler, void *userdata);
-void smlQueueSend(SmlQueue *queue, void *data);
-void smlQueueAttach(SmlQueue *queue, GMainContext *context);
-void smlQueueDetach(SmlQueue *queue);
-void smlQueueDispatch(SmlQueue *queue);
-void *smlQueueTryPop(SmlQueue *queue);
-SmlBool smlQueueCheck(SmlQueue *queue);
-void smlQueuePushHead(SmlQueue *queue, void *data);
-SmlBool smlQueueIsAttached(SmlQueue *queue);
-void smlQueueLock(SmlQueue *queue);
-void smlQueueUnlock(SmlQueue *queue);
-void *smlQueuePeek(SmlQueue *queue);
-GList *smlQueuePeekNext(SmlQueue *queue, GList *prev);
-void *smlQueueTryPopPrio(SmlQueue *queue);
-void smlQueuePushHeadPrio(SmlQueue *queue, void *data);
-void smlQueueSendPrio(SmlQueue *queue, void *data);
-SmlBool smlQueueCheckPrio(SmlQueue *queue);
-void smlQueueDispatchPrio(SmlQueue *queue);
-void *smlQueuePeekPrio(SmlQueue *queue);
-void smlQueuePrint(SmlQueue *queue);
-unsigned int smlQueueLength(SmlQueue *queue);
-unsigned int smlQueueLengthPrio(SmlQueue *queue);
+SmlQueue* smlQueueNew          (GError **error);
+void      smlQueueFree         (SmlQueue *queue);
+void      smlQueueFlush        (SmlQueue *queue);
+void      smlQueueSetHandler   (SmlQueue *queue, SmlQueueHandler handler, void *userdata);
+void      smlQueueSend         (SmlQueue *queue, void *data);
+void      smlQueueAttach       (SmlQueue *queue, GMainContext *context);
+void      smlQueueDetach       (SmlQueue *queue);
+void      smlQueueDispatch     (SmlQueue *queue);
+void*     smlQueueTryPop       (SmlQueue *queue);
+gboolean  smlQueueCheck        (SmlQueue *queue);
+void      smlQueuePushHead     (SmlQueue *queue, void *data);
+gboolean  smlQueueIsAttached   (SmlQueue *queue);
+void      smlQueueLock         (SmlQueue *queue);
+void      smlQueueUnlock       (SmlQueue *queue);
+void*     smlQueuePeek         (SmlQueue *queue);
+GList*    smlQueuePeekNext     (SmlQueue *queue, GList *prev);
+void*     smlQueueTryPopPrio   (SmlQueue *queue);
+void      smlQueuePushHeadPrio (SmlQueue *queue, void *data);
+void      smlQueueSendPrio     (SmlQueue *queue, void *data);
+gboolean  smlQueueCheckPrio    (SmlQueue *queue);
+void      smlQueueDispatchPrio (SmlQueue *queue);
+void*     smlQueuePeekPrio     (SmlQueue *queue);
+void      smlQueuePrint        (SmlQueue *queue);
+gsize     smlQueueLength       (SmlQueue *queue);
+gsize     smlQueueLengthPrio   (SmlQueue *queue);
 
 #endif //_SML_QUEUE_INTERNALS_H_