Update copyright lines with new year.

[simgrid.git] / contrib / benchmarking_code_block / inject.h

diff --git a/contrib/benchmarking_code_block/inject.h b/contrib/benchmarking_code_block/inject.h
index 8d7907d..0d8e6b2 100644 (file)
--- a/contrib/benchmarking_code_block/inject.h
+++ b/contrib/benchmarking_code_block/inject.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2017. The SimGrid Team.
+/* Copyright (c) 2013-2020. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -56,8 +56,7 @@ static inline void xbt_inject_init(char *inputfile)
 {
   xbt_dict_t mydict = get_dict();
   FILE* fpInput     = fopen(inputfile, "r");
-  if (fpInput == NULL)
-    printf("Error while opening the inputfile");
+  xbt_assert(fpInput != NULL, "Error while opening the inputfile");
   fseek(fpInput, 0, 0);
 
   char line[200];
@@ -66,7 +65,7 @@ static inline void xbt_inject_init(char *inputfile)
   if (fgets(line, 200, fpInput) == NULL)
     printf("Error input file is empty!"); // Skipping first row
   while (fgets(line, 200, fpInput) != NULL) {
-    char *saveptr; /* for strtok_r() */
+    char *saveptr = NULL; /* for strtok_r() */
     key = strtok_r(line, "\t", &saveptr);
 
     xbt_hist_t* data = xbt_dict_get_or_null(mydict, key);
@@ -87,7 +86,7 @@ static inline void xbt_inject_init(char *inputfile)
     for (int i            = 0; i < (data->n - 1); i++)
       data->percentage[i] = atof(strtok_r(NULL, "\t", &saveptr));
 
-    xbt_dict_set(mydict, key, data, NULL);
+    xbt_dict_set(mydict, key, data);
   }
   fclose(fpInput);
 }
@@ -119,7 +118,7 @@ static inline void inject_init_starpu(char *inputfile, xbt_dict_t *dict, RngStre
   }
 
   while (fgets(line, MAX_LINE_INJ, fpInput) != NULL) {
-    char *saveptr; /* for strtok_r() */
+    char *saveptr = NULL; /* for strtok_r() */
     key = strtok_r(line, "\t", &saveptr);
 
     xbt_hist_t* data = xbt_dict_get_or_null(mydict, key);
@@ -140,7 +139,7 @@ static inline void inject_init_starpu(char *inputfile, xbt_dict_t *dict, RngStre
       data->percentage[i] = atof(strtok_r(NULL, "\t", &saveptr));
     }
 
-    xbt_dict_set(mydict, key, data, NULL);
+    xbt_dict_set(mydict, key, data);
   }
   fclose(fpInput);
 }