Server: Change read_config_file() parameter order (stylistic reasons).

diff --git a/src/server/init.c b/src/server/init.c
index df3db81b09cd8439fdd56947dfb74aa42bcd6207..3bbd5035c6fa2f4c1bb5e10424db0619f6e64a35 100644 (file)
--- a/src/server/init.c
+++ b/src/server/init.c
@@ -68,13 +68,11 @@ extern void init_map_and_map_objects_configs()
     exit_err(access(world.path_map_obj_defs, F_OK), err_mod);
     exit_err(access(world.path_map_obj_acts, F_OK), err_moa);
     read_config_file(world.path_map_obj_defs, CLEANUP_MAP_OBJECT_DEFS,
-                     sizeof(struct MapObjDef),
-                     (struct EntrySkeleton **) &world.map_obj_defs,
-                     read_map_object_def);
+                     read_map_object_def, sizeof(struct MapObjDef),
+                     (struct EntrySkeleton **) &world.map_obj_defs);
     read_config_file(world.path_map_obj_acts, CLEANUP_MAP_OBJECT_ACTS,
-                     sizeof(struct MapObjAct),
-                     (struct EntrySkeleton **) &world.map_obj_acts,
-                     read_map_object_action);
+                     read_map_object_action, sizeof(struct MapObjAct),
+                     (struct EntrySkeleton **) &world.map_obj_acts);
 }
 
 

diff --git a/src/server/io.c b/src/server/io.c
index 079a8339c6bd3ac28d8a8932f3f952b0a4a7fec0..f318ca6c15d8716c5b3eb6394a6216bf0996973c 100644 (file)
--- a/src/server/io.c
+++ b/src/server/io.c
@@ -224,9 +224,9 @@ static void write_map(FILE * file)
 
 
 extern void read_config_file(char * path, enum cleanup_flag cleanup,
-                             size_t size, struct EntrySkeleton ** entry_start,
                              void (* read) (char *, uint32_t, char *,
-                                            struct EntrySkeleton *, FILE *))
+                                            struct EntrySkeleton *, FILE *),
+                             size_t size, struct EntrySkeleton ** entry_start)
 {
     char * f_name = "init_map_object_defs()";
     char * context_prefix = "Failed reading config file: ";

diff --git a/src/server/io.h b/src/server/io.h
index 9c7de70ec384332e82b23d9b2c9c8dc0ac3e9fb2..ad1344fcabf9d9bfee69e2a290198b6f1a124ad8 100644 (file)
--- a/src/server/io.h
+++ b/src/server/io.h
@@ -25,9 +25,9 @@ struct EntrySkeleton
     struct EntrySkeleton * next;
 };
 extern void read_config_file(char * path, enum cleanup_flag cleanup,
-                             size_t size, struct EntrySkeleton ** entry_start,
                              void (* read) (char *, uint32_t, char *,
-                                            struct EntrySkeleton *, FILE *));
+                                            struct EntrySkeleton *, FILE *),
+                             size_t size, struct EntrySkeleton ** entry_start);
 
 /* Return single \0-terminated string read from input queue (world.queue); or,
  * if queue is empty and world.turn is unequal world.last_update_turn, update