X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fsettings.h;h=f6a33fd6e8aff8ca9a55902fe891ce46f39fac03;hb=0bb0ee0e00d750808e228b991c78cb4838bc989d;hp=5826ac6baafab531268e32d81d7f5afe2b0c25a0;hpb=ca27c970f17c8273c91ddb35b5bdc5059b601f5e;p=pazpar2-moved-to-github.git

diff --git a/src/settings.h b/src/settings.h
index 5826ac6..f6a33fd 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -65,25 +65,24 @@ struct setting
     struct setting *next;
 };
 
-struct settings
+struct settings_array
 {
     // Array of pointer setting, index is looked up in setting_dictionary
     struct setting **settings;
     int num_settings;
 };
 
-void settings_read_file(struct conf_service *service, const char *path,
-                        int pass);
-void settings_read_node(struct conf_service *service, xmlNode *n,
-                        int pass);
+int settings_read_file(struct conf_service *service, const char *path,
+                       int pass);
+int settings_read_node(struct conf_service *service, xmlNode *n, int pass);
 int settings_num(struct conf_service *service);
 int settings_create_offset(struct conf_service *service, const char *name);
 int settings_lookup_offset(struct conf_service *service, const char *name);
 void init_settings(struct conf_service *service);
-void settings_read_node_x(xmlNode *n,
-                          void *client_data,
-                          void (*fun)(void *client_data,
-                                      struct setting *set));
+int settings_read_node_x(xmlNode *n,
+                         void *client_data,
+                         void (*fun)(void *client_data,
+                                     struct setting *set));
 void expand_settings_array(struct setting ***set_ar, int *num, int offset,
                            NMEM nmem);