[Opensync-commits] r1219 - in trunk/libsyncml: . data_sync_api

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

Author: bellmich
Date: Fri Jul 17 18:34:20 2009
New Revision: 1219
URL: http://libsyncml.opensync.org/changeset/1219

Log:
cleaned up header file usage in data sync API

Modified:
   trunk/libsyncml/data_sync_api/data_sync.c
   trunk/libsyncml/data_sync_api/data_sync_callbacks.c
   trunk/libsyncml/data_sync_api/data_sync_client.c
   trunk/libsyncml/data_sync_api/data_sync_loop.c
   trunk/libsyncml/data_sync_api/data_sync_server.c
   trunk/libsyncml/sml_manager.h
   trunk/libsyncml/sml_manager_internals.h

Modified: trunk/libsyncml/data_sync_api/data_sync.c
==============================================================================
--- trunk/libsyncml/data_sync_api/data_sync.c	Fri Jul 17 15:02:17 2009	(r1218)
+++ trunk/libsyncml/data_sync_api/data_sync.c	Fri Jul 17 18:34:20 2009	(r1219)
@@ -30,18 +30,15 @@
 
 /* required because of function index */
 #include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
 
 #include "data_sync.h"
 #include "data_sync_client.h"
 #include "data_sync_server.h"
 #include "data_sync_callbacks.h"
-#include "data_sync_callbacks.h"
 #include "data_sync_devinf.h"
 #include "data_sync_loop.h"
 #include "transport.h"
-#include "libsyncml/objects/sml_ds_server_internals.h"
+#include "libsyncml/objects/sml_ds_server.h"
 
 /* ********************************* */
 /* object creation and configuration */

Modified: trunk/libsyncml/data_sync_api/data_sync_callbacks.c
==============================================================================
--- trunk/libsyncml/data_sync_api/data_sync_callbacks.c	Fri Jul 17 15:02:17 2009	(r1218)
+++ trunk/libsyncml/data_sync_api/data_sync_callbacks.c	Fri Jul 17 18:34:20 2009	(r1219)
@@ -19,23 +19,17 @@
  */
 
 #include "data_sync_callbacks.h"
+
 #include "libsyncml/sml_support.h"
 #include "libsyncml/sml_error_internals.h"
+
 #include <string.h>
 #include <strings.h>
-#include <stdio.h>
-#include <stdlib.h>
+
 #include "defines.h"
 #include "data_sync_devinf.h"
-#include "libsyncml/objects/sml_ds_server_internals.h"
-#include "libsyncml/sml_manager_internals.h"
-
-//#include "syncml_common.h"
-//#include "syncml_callbacks.h"
-//#include "syncml_vformat.h"
-//#include "syncml_devinf.h"
-//#include "syncml_ds_client.h"
-//#include "syncml_ds_server.h"
+#include "libsyncml/objects/sml_ds_server.h"
+#include "libsyncml/sml_manager.h"
 
 /* **************************************** */
 /* *****     Management Callbacks     ***** */

Modified: trunk/libsyncml/data_sync_api/data_sync_client.c
==============================================================================
--- trunk/libsyncml/data_sync_api/data_sync_client.c	Fri Jul 17 15:02:17 2009	(r1218)
+++ trunk/libsyncml/data_sync_api/data_sync_client.c	Fri Jul 17 18:34:20 2009	(r1219)
@@ -18,13 +18,15 @@
  *
  */
 
-#include "data_sync_server.h"
-#include "data_sync_common.h"
+#include "data_sync_client.h"
+
+#include "libsyncml/sml_support.h"
 #include "libsyncml/sml_error_internals.h"
+
+#include "data_sync_common.h"
 #include "data_sync_callbacks.h"
-#include "libsyncml/objects/sml_ds_server.h"
 #include "data_sync_devinf.h"
-#include "libsyncml/sml_support.h"
+#include "libsyncml/objects/sml_ds_server.h"
 
 static gboolean
 smlDataSyncClientAlertCallback (SmlDsSession *dsession,

Modified: trunk/libsyncml/data_sync_api/data_sync_loop.c
==============================================================================
--- trunk/libsyncml/data_sync_api/data_sync_loop.c	Fri Jul 17 15:02:17 2009	(r1218)
+++ trunk/libsyncml/data_sync_api/data_sync_loop.c	Fri Jul 17 18:34:20 2009	(r1219)
@@ -18,8 +18,9 @@
  *
  */
 
+#include "data_sync_loop.h"
+
 #include "../sml_support.h"
-#include "data_sync_devinf.h"
 #include "libsyncml/sml_error_internals.h"
 
 static gboolean _prepare(GSource *source, gint *timeout_)

Modified: trunk/libsyncml/data_sync_api/data_sync_server.c
==============================================================================
--- trunk/libsyncml/data_sync_api/data_sync_server.c	Fri Jul 17 15:02:17 2009	(r1218)
+++ trunk/libsyncml/data_sync_api/data_sync_server.c	Fri Jul 17 18:34:20 2009	(r1219)
@@ -19,12 +19,14 @@
  */
 
 #include "data_sync_server.h"
-#include "data_sync_common.h"
+
 #include "libsyncml/sml_error_internals.h"
+#include "libsyncml/sml_support.h"
+
 #include "data_sync_callbacks.h"
-#include "libsyncml/objects/sml_ds_server.h"
+#include "data_sync_common.h"
 #include "data_sync_devinf.h"
-#include "libsyncml/sml_support.h"
+#include "libsyncml/objects/sml_ds_server.h"
 #include <string.h>
 
 static gboolean

Modified: trunk/libsyncml/sml_manager.h
==============================================================================
--- trunk/libsyncml/sml_manager.h	Fri Jul 17 15:02:17 2009	(r1218)
+++ trunk/libsyncml/sml_manager.h	Fri Jul 17 18:34:20 2009	(r1219)
@@ -89,6 +89,8 @@
 
 SmlTransport*     smlManagerGetTransport       (SmlManager *manager);
 
+SmlLink* smlManagerSessionGetLink (SmlManager *manager, SmlSession *session, GError **error);
+
 #endif //_SML_MANAGER_H
 
 /*@}*/

Modified: trunk/libsyncml/sml_manager_internals.h
==============================================================================
--- trunk/libsyncml/sml_manager_internals.h	Fri Jul 17 15:02:17 2009	(r1218)
+++ trunk/libsyncml/sml_manager_internals.h	Fri Jul 17 18:34:20 2009	(r1219)
@@ -83,8 +83,6 @@
 void smlManagerSessionFinalLockRef   (SmlManager *manager, SmlSession *session);
 void smlManagerSessionFinalLockUnref (SmlManager *manager, SmlSession *session);
 
-SmlLink* smlManagerSessionGetLink (SmlManager *manager, SmlSession *session, GError **error);
-
 #endif //_SML_MANAGER_INTERNALS_H
 
 /*@}*/