From: Arnaud Giersch Date: Thu, 20 Mar 2014 20:11:27 +0000 (+0100) Subject: Don't use xbt_assert for error checking. X-Git-Tag: v3_11~203^2~1 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/5e3e50f757f70251b3fdf0b6610fe65071dd0d5b?hp=01a65e5b91b500b3659a5c52cc386bbecc77f608 Don't use xbt_assert for error checking. It's deactivated when building with enable_debug=OFF. --- diff --git a/src/surf/storage_interface.cpp b/src/surf/storage_interface.cpp index 90e14c7939..5e1ef7340f 100644 --- a/src/surf/storage_interface.cpp +++ b/src/surf/storage_interface.cpp @@ -98,8 +98,9 @@ xbt_dict_t Storage::parseContent(char *filename) FILE *file = NULL; file = surf_fopen(filename, "r"); - xbt_assert(file != NULL, "Cannot open file '%s' (path=%s)", filename, - xbt_str_join(surf_path, ":")); + if (file == NULL) + xbt_die("Cannot open file '%s' (path=%s)", filename, + xbt_str_join(surf_path, ":")); char *line = NULL; size_t len = 0; @@ -107,10 +108,9 @@ xbt_dict_t Storage::parseContent(char *filename) char path[1024]; sg_size_t size; - while ((read = xbt_getline(&line, &len, file)) != -1) { if (read){ - if(sscanf(line,"%s %llu", path, &size) == 2) { + if(sscanf(line,"%s %llu", path, &size) == 2) { m_usedSize += size; sg_size_t *psize = xbt_new(sg_size_t, 1); *psize = size;