make jedule compilable with all warning flags

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9597 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/include/instr/jedule/jedule_events.h b/include/instr/jedule/jedule_events.h
index d2d6a97..9ea2893 100644 (file)
--- a/include/instr/jedule/jedule_events.h
+++ b/include/instr/jedule/jedule_events.h
@@ -33,7 +33,7 @@ typedef struct jed_event s_jed_event_t, *jed_event_t;
 
 /************************************************************/
 
-void create_jed_event(jed_event_t *event, char *name, double start_time, double end_time, char *type);
+void create_jed_event(jed_event_t *event, char *name, double start_time, double end_time, const char *type);
 
 void jed_event_free(jed_event_t event);
 

diff --git a/include/instr/jedule/jedule_output.h b/include/instr/jedule/jedule_output.h
index f75d699..a735ff7 100644 (file)
--- a/include/instr/jedule/jedule_output.h
+++ b/include/instr/jedule/jedule_output.h
@@ -19,9 +19,9 @@
 
 extern xbt_dynar_t jedule_event_list;
 
-void jedule_init_output();
+void jedule_init_output(void);
 
-void jedule_cleanup_output();
+void jedule_cleanup_output(void);
 
 void jedule_store_event(jed_event_t event);
 

diff --git a/include/instr/jedule/jedule_sd_binding.h b/include/instr/jedule/jedule_sd_binding.h
index 4a8b700..cdd132b 100644 (file)
--- a/include/instr/jedule/jedule_sd_binding.h
+++ b/include/instr/jedule/jedule_sd_binding.h
@@ -18,13 +18,13 @@
 
 void jedule_log_sd_event(SD_task_t task);
 
-void jedule_setup_platform();
+void jedule_setup_platform(void);
 
-void jedule_sd_init();
+void jedule_sd_init(void);
 
-void jedule_sd_cleanup();
+void jedule_sd_cleanup(void);
 
-void jedule_sd_dump();
+void jedule_sd_dump(void);
 
 #endif /* JEDULE_SD_BINDING_H_ */
 

diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h
index e3fe27e..e3a6778 100644 (file)
--- a/src/instr/instr_private.h
+++ b/src/instr/instr_private.h
@@ -231,4 +231,9 @@ void instr_new_user_host_variable_type  (const char *new_typename, const char *c
 int instr_platform_traced (void);
 
 #endif /* HAVE_TRACING */
+
+#ifdef HAVE_JEDULE
+#include "instr/jedule/jedule_sd_binding.h"
+#endif
+
 #endif /* INSTR_PRIVATE_H_ */

diff --git a/src/instr/jedule/jedule_events.c b/src/instr/jedule/jedule_events.c
index 7f77000..5075f4d 100644 (file)
--- a/src/instr/jedule/jedule_events.c
+++ b/src/instr/jedule/jedule_events.c
@@ -21,7 +21,7 @@
 void jed_event_add_resources(jed_event_t event, xbt_dynar_t host_selection) {
        xbt_dynar_t resource_subset_list;
        jed_res_subset_t res_set;
-       int i;
+       unsigned int i;
 
        resource_subset_list = xbt_dynar_new(sizeof(jed_res_subset_t), NULL);
 
@@ -51,7 +51,7 @@ void jed_event_add_info(jed_event_t event, char *key, char *value) {
 
 
 void create_jed_event(jed_event_t *event, char *name, double start_time,
-               double end_time, char *type) {
+               double end_time, const char *type) {
 
        *event = (jed_event_t) calloc(1, sizeof(s_jed_event_t));
        (*event)->name = (char*) calloc(strlen(name) + 1, sizeof(char));

diff --git a/src/instr/jedule/jedule_output.c b/src/instr/jedule/jedule_output.c
index b670ad7..71bce59 100644 (file)
--- a/src/instr/jedule/jedule_output.c
+++ b/src/instr/jedule/jedule_output.c
@@ -10,11 +10,11 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "instr/jedule/jedule_output.h"
-
 #include "xbt/dynar.h"
 #include "xbt/asserts.h"
 
+#include "instr/jedule/jedule_output.h"
+
 #ifdef HAVE_JEDULE
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(jed_out, jedule,

diff --git a/src/instr/jedule/jedule_sd_binding.c b/src/instr/jedule/jedule_sd_binding.c
index fc4bc95..52a8398 100644 (file)
--- a/src/instr/jedule/jedule_sd_binding.c
+++ b/src/instr/jedule/jedule_sd_binding.c
@@ -69,7 +69,7 @@ static void create_hierarchy(routing_component_t current_comp,
 
                xbt_dict_foreach(current_comp->to_index, cursor, key, network_elem) {
                        char *hostname;
-                       DEBUG2("key %s value %d\n", key, network_elem);
+                       DEBUG2("key %s value %p\n", key, network_elem);
                        //xbt_dynar_push_as(hosts, char*, key);
                        hostname = strdup(key);
                        xbt_dynar_push(hosts, &hostname);