Merge branch 'trunk' into audioaudio

1 files changed, 15 insertions, 21 deletions

diff --git a/navit/atom.c b/navit/atom.c
index de11ce8bc..087729972 100644
--- a/navit/atom.c
+++ b/navit/atom.c
@@ -3,29 +3,23 @@
 
 static GHashTable *atom_hash;
 
-char *
-atom_lookup(char *name)
-{
-	if (!atom_hash)
-		return NULL;
-	return g_hash_table_lookup(atom_hash,name);
+char *atom_lookup(char *name) {
+    if (!atom_hash)
+        return NULL;
+    return g_hash_table_lookup(atom_hash,name);
 }
 
-char *
-atom(char *name)
-{
-	char *id=atom_lookup(name);
-	if (id)
-		return id;
-	if (!atom_hash)
-		return NULL;
-	id=g_strdup(name);
-	g_hash_table_insert(atom_hash, id, id);
-	return id;
+char *atom(char *name) {
+    char *id=atom_lookup(name);
+    if (id)
+        return id;
+    if (!atom_hash)
+        return NULL;
+    id=g_strdup(name);
+    g_hash_table_insert(atom_hash, id, id);
+    return id;
 }
 
-void
-atom_init(void)
-{
-	atom_hash=g_hash_table_new(g_str_hash, g_str_equal);
+void atom_init(void) {
+    atom_hash=g_hash_table_new(g_str_hash, g_str_equal);
 }