Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorAdam Dickmeiss <adam@indexdata.dk>
Thu, 26 Apr 2012 12:23:17 +0000 (14:23 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Thu, 26 Apr 2012 12:23:17 +0000 (14:23 +0200)
Conflicts:
src/settings.h

1  2 
src/http_command.c
src/pazpar2_config.c
src/settings.c
src/settings.h

Simple merge
Simple merge
diff --cc src/settings.c
Simple merge
diff --cc src/settings.h
@@@ -62,10 -65,17 +65,16 @@@ struct settin
      struct setting *next;
  };
  
+ struct settings
+ {
+     // 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_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);