[Opensync-commits] r1340 - in trunk: . tools

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

Author: bellmich
Date: Fri Oct 16 17:44:28 2009
New Revision: 1340
URL: http://libsyncml.opensync.org/changeset/1340

Log:
try to fix problem with glib checksum support

Modified:
   trunk/config.h.cmake
   trunk/tools/syncml-ds-tool.c
   trunk/tools/syncml-ds-tool_internals.c
   trunk/tools/syncml-ds-tool_internals.h

Modified: trunk/config.h.cmake
==============================================================================
--- trunk/config.h.cmake	Fri Oct 16 17:09:09 2009	(r1339)
+++ trunk/config.h.cmake	Fri Oct 16 17:44:28 2009	(r1340)
@@ -95,3 +95,7 @@
 
 /* wbxml */
 /* #undef WBXML_LIBS */
+
+/* glib checksum support */
+#cmakedefine HAVE_GLIB_GCHECKSUM_H
+

Modified: trunk/tools/syncml-ds-tool.c
==============================================================================
--- trunk/tools/syncml-ds-tool.c	Fri Oct 16 17:09:09 2009	(r1339)
+++ trunk/tools/syncml-ds-tool.c	Fri Oct 16 17:44:28 2009	(r1340)
@@ -1298,7 +1298,13 @@
 			gsize file_length = 0;
 			if (!g_file_get_contents(absolute_uid, &file_data, &file_length, error))
 				goto error;
+#ifdef HAVE_GLIB_GCHECKSUM_H
 			file_digest = g_compute_checksum_for_data(G_CHECKSUM_SHA256, (guchar *) file_data, file_length);
+#else
+			file_digest = sml_ds_tool_get_md5 (file_data, file_length, error);
+			if (!file_digest)
+				goto error;
+#endif
 			smlSafeCFree(&file_data);
 		}
 

Modified: trunk/tools/syncml-ds-tool_internals.c
==============================================================================
--- trunk/tools/syncml-ds-tool_internals.c	Fri Oct 16 17:09:09 2009	(r1339)
+++ trunk/tools/syncml-ds-tool_internals.c	Fri Oct 16 17:44:28 2009	(r1340)
@@ -20,3 +20,18 @@
 
 #include <libsyncml/sml_support.h>
 #include <libsyncml/sml_error_internals.h>
+
+#ifndef HAVE_GLIB_GCHECKSUM_H
+
+#include <libsyncml/sml_md5.h>
+gchar*
+sml_ds_tool_get_md5 (gchar *data,
+                     gsize length,
+                     GError **error)
+{
+	guchar md5[16];
+	smlMD5GetDigest (data, length, md5);
+	return smlMD5ToString(md5, error);
+}
+
+#endif

Modified: trunk/tools/syncml-ds-tool_internals.h
==============================================================================
--- trunk/tools/syncml-ds-tool_internals.h	Fri Oct 16 17:09:09 2009	(r1339)
+++ trunk/tools/syncml-ds-tool_internals.h	Fri Oct 16 17:44:28 2009	(r1340)
@@ -38,3 +38,9 @@
  */
 #define VA_STRING(param) param?param:"NULL"
 
+#ifndef HAVE_GLIB_GCHECKSUM_H
+
+gchar* sml_ds_tool_get_md5 (gchar *data, gsize length, GError **error);
+
+#endif
+