[rygel-gst-0-10-plugins/wip/tracking: 4/5] Move uuid generation into separate file.

[Krzesimir Nowak <krnowak src gnome org>]

commit 4cf1a6612f599779cb9bbd4fbfd1442414c84e0f
Author: Krzesimir Nowak <krnowak openismus com>
Date:   Tue Feb 19 16:05:49 2013 +0100

    Move uuid generation into separate file.

 src/media-export/Makefile.am                      |    1 +
 src/media-export/rygel-media-export-media-cache.c |    9 +----
 src/media-export/rygel-media-export-uuid.c        |   38 +++++++++++++++++++++
 src/media-export/rygel-media-export-uuid.h        |   32 +++++++++++++++++
 4 files changed, 73 insertions(+), 7 deletions(-)
---
diff --git a/src/media-export/Makefile.am b/src/media-export/Makefile.am
index 9cdad6b..fee3fe7 100644
--- a/src/media-export/Makefile.am
+++ b/src/media-export/Makefile.am
@@ -32,6 +32,7 @@ librygel_media_export_gst_0_10_la_SOURCES = \
        rygel-media-export-sqlite-wrapper.c \
        rygel-media-export-string-utils.c \
        rygel-media-export-trackable-db-container.c \
+       rygel-media-export-uuid.c \
        rygel-media-export-video-item.c \
        rygel-media-export-writable-db-container.c
 
diff --git a/src/media-export/rygel-media-export-media-cache.c 
b/src/media-export/rygel-media-export-media-cache.c
index 8e0a31a..c7b49ee 100644
--- a/src/media-export/rygel-media-export-media-cache.c
+++ b/src/media-export/rygel-media-export-media-cache.c
@@ -21,7 +21,6 @@
 
 #include <glib/gi18n-lib.h>
 #include <sqlite3.h>
-#include <uuid.h>
 
 #include "rygel-media-export-database-cursor.h"
 #include "rygel-media-export-database.h"
@@ -35,6 +34,7 @@
 #include "rygel-media-export-sql-function.h"
 #include "rygel-media-export-sql-operator.h"
 #include "rygel-media-export-string-utils.h"
+#include "rygel-media-export-uuid.h"
 #include "rygel-media-export-video-item.h"
 
 /**
@@ -1190,14 +1190,9 @@ rygel_media_export_media_cache_get_reset_token (RygelMediaExportMediaCache *self
 
  out:
   if (inner_error) {
-    uuid_t uu;
-
     g_warning ("Failed to get reset token: %s", inner_error->message);
     g_error_free (inner_error);
-    uuid_generate (uu);
-    token = g_malloc (51);
-    uuid_unparse (uu, token);
-    token[50] = '\0';
+    token = rygel_media_export_uuid_get ();
   }
 
   return token;
diff --git a/src/media-export/rygel-media-export-uuid.c b/src/media-export/rygel-media-export-uuid.c
new file mode 100644
index 0000000..a2a8e74
--- /dev/null
+++ b/src/media-export/rygel-media-export-uuid.c
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2010 Jens Georg <mail jensge org>.
+ * Copyright (C) 2012, 2013 Intel Corporation.
+ *
+ * Author: Jens Georg <mail jensge org>
+ *
+ * This file is part of Rygel.
+ *
+ * Rygel is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Rygel is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include <uuid.h>
+
+#include "rygel-media-export-uuid.h"
+
+gchar *
+rygel_media_export_uuid_get (void) {
+  uuid_t uu;
+  gchar *token = g_malloc (51);
+
+  uuid_generate (uu);
+  uuid_unparse (uu, token);
+  token[50] = '\0';
+
+  return token;
+}
diff --git a/src/media-export/rygel-media-export-uuid.h b/src/media-export/rygel-media-export-uuid.h
new file mode 100644
index 0000000..742161b
--- /dev/null
+++ b/src/media-export/rygel-media-export-uuid.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2010 Jens Georg <mail jensge org>.
+ * Copyright (C) 2012, 2013 Intel Corporation.
+ *
+ * Author: Jens Georg <mail jensge org>
+ *
+ * This file is part of Rygel.
+ *
+ * Rygel is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Rygel is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __RYGEL_0_10_PLUGINS_MEDIA_EXPORT_UUID_H__
+#define __RYGEL_0_10_PLUGINS_MEDIA_EXPORT_UUID_H__
+
+#include <glib.h>
+
+gchar *
+rygel_media_export_uuid_get (void);
+
+#endif