Changeset 69cb623 for storage.c

Timestamp:

2006-10-15T09:41:12Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

2529faf

Parents:

695e392 (diff), e97827b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging with storage-xml. It seems to be working pretty well, so maybe
this way more people will test it. :-)

File:

• storage.c (modified) (4 diffs)

storage.c

@@ -6 +6 @@
 
 /* Support for multiple storage backends */
+
+/* Copyright (C) 2005 Jelmer Vernooij <jelmer@samba.org> */
 
 /*
@@ -29 +31 @@
 
 extern storage_t storage_text;
+extern storage_t storage_xml;
 
-static GList text_entry = { &storage_text, NULL, NULL };
-static GList *storage_backends = &text_entry;
+static GList *storage_backends = NULL;
 
 void register_storage_backend(storage_t *backend)
@@ -41 +43 @@
 {
         GList *gl;
-        storage_t *st;
+        storage_t *st = NULL;
 
         for (gl = storage_backends; gl; gl = gl->next) {
@@ -63 +65 @@
         int i;
         storage_t *storage;
-
+        
+        register_storage_backend(&storage_text);
+        register_storage_backend(&storage_xml);
+        
         storage = storage_init_single(primary);
-        if (storage == NULL)
+        if (storage == NULL && storage->save == NULL)
                 return NULL;