core/string: Convert file to C

And convert the unit test while we're at it.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>

core/Sconscript

@@ -3,5 +3,5 @@ Import("env")
 
 env.UsePackage("taglib")
 
-res = Glob("*.cpp") + SConscript("tags/Sconscript")
+res = Glob("*.cpp") + Glob("*.c") + SConscript("tags/Sconscript")
 Return("res")

core/filter.cpp

@@ -4,7 +4,10 @@
 
 #include <core/filter.h>
 #include <core/index.h>
+
+extern "C" {
 #include <core/string.h>
+}
 
 #include <algorithm>
 

core/string.c

@@ -2,7 +2,6 @@
  * Copyright 2015 (c) Anna Schumaker.
  */
 #include <core/string.h>
-#include <string.h>
 
 #define O_SECONDS (1)
 #define O_MINUTES (60)

core/tags/generic.cpp

@@ -1,7 +1,9 @@
 /**
  * Copyright 2014 (c) Anna Schumaker.
  */
+extern "C" {
 #include <core/string.h>
+}
 #include <core/tags/generic.h>
 
 GenericTag :: GenericTag() {}

gui/gst.cpp

@@ -6,7 +6,9 @@
  * what options are supported.
  */
 #include <core/audio.h>
+extern "C" {
 #include <core/string.h>
+}
 #include <gui/ocarina.h>
 #include <gst/gst.h>
 

gui/queue/model.cpp

@@ -5,7 +5,9 @@
  * https://git.gnome.org/browse/gtkmm-documentation/tree/examples/others/treemodelcustom
  */
 #include <core/audio.h>
+extern "C" {
 #include <core/string.h>
+}
 #include <gui/queue/model.h>
 #include <stdlib.h>
 

gui/tabs.cpp

@@ -3,7 +3,9 @@
  */
 #include <core/deck.h>
 #include <core/playlist.h>
+extern "C" {
 #include <core/string.h>
+}
 #include <gui/tabs.h>
 
 #include <map>

include/core/database.h

@@ -7,6 +7,7 @@
 #include <core/file.h>
 
 #include <map>
+#include <string>
 #include <vector>
 
 template<class T> class Database;

include/core/string.h

@@ -8,6 +8,7 @@
 #define OCARINA_CORE_STRING_H
 
 #include <glib.h>
+#include <string.h>
 
 
 /* Convert number of seconds into a string with format mm:ss.  */

tests/core/Sconscript

@@ -14,7 +14,7 @@ Export("core_objs")
 
 
 res  = [ CoreTest("version",  "version.c")    ]
-res += [ CoreTest("string",   "string.cpp")   ]
+res += [ CoreTest("string",   "string.c")     ]
 res += [ CoreTest("random",   "random.cpp")   ]
 res += [ CoreTest("file",     "file.cpp")     ]
 res += [ CoreTest("database", "database.cpp") ]

tests/core/string.c

@@ -3,7 +3,7 @@
  * Test the string formatting functions.
  */
 #include <core/string.h>
-#include "test.h"
+#include <tests/test.h>
 
 static char buf[25];