A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added platform for ns3 wifi example
[simgrid.git]
/
src
/
xbt
/
xbt_log_appender_file.cpp
diff --git
a/src/xbt/xbt_log_appender_file.cpp
b/src/xbt/xbt_log_appender_file.cpp
index 669f2dfc47cf6ec436a708096cd46ea41b7cfe38..577e934c80925b7347a3c04c4ca1176eef15fa95 100644
(file)
--- a/
src/xbt/xbt_log_appender_file.cpp
+++ b/
src/xbt/xbt_log_appender_file.cpp
@@
-1,6
+1,6
@@
/* file_appender - a dumb log appender which simply prints to a file */
/* file_appender - a dumb log appender which simply prints to a file */
-/* Copyright (c) 2007-20
19
. The SimGrid Team.
+/* Copyright (c) 2007-20
20
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-71,25
+71,24
@@
static void open_append2_file(xbt_log_append2_file_t data){
//Split
if(data->file)
fclose(data->file);
//Split
if(data->file)
fclose(data->file);
- char newname[512];
char* pre=xbt_strdup(data->filename);
char* sep=strchr(pre,'%');
if(!sep)
sep=pre+strlen(pre);
char* pre=xbt_strdup(data->filename);
char* sep=strchr(pre,'%');
if(!sep)
sep=pre+strlen(pre);
- c
har* post=sep+
1;
- *sep
=
'\0';
- s
nprintf(newname,511,"%s%i%s",pre,data->count,post)
;
+ c
onst char* post = sep +
1;
+ *sep
=
'\0';
+ s
td::string newname = pre + std::to_string(data->count) + post
;
data->count++;
data->count++;
- data->file
= fopen(newname
, "w");
+ data->file
= fopen(newname.c_str()
, "w");
if (data->file == nullptr)
if (data->file == nullptr)
- xbt_die("Cannot open file: %s: %s", newname, strerror(errno));
+ xbt_die("Cannot open file: %s: %s", newname
.c_str()
, strerror(errno));
xbt_free(pre);
}
}
static void append2_file(const s_xbt_log_appender_t* this_, const char* str)
{
xbt_free(pre);
}
}
static void append2_file(const s_xbt_log_appender_t* this_, const char* str)
{
-
xbt_log_append2_file_t d = (xbt_log_append2_file_t)this_->data
;
+
auto* d = static_cast<xbt_log_append2_file_t>(this_->data)
;
xbt_assert(d->file);
if (ftell(d->file) >= d->limit) {
open_append2_file(d);
xbt_assert(d->file);
if (ftell(d->file) >= d->limit) {
open_append2_file(d);
@@
-103,7
+102,7
@@
static void append2_file(const s_xbt_log_appender_t* this_, const char* str)
static void free_append2_(const s_xbt_log_appender_t* this_)
{
static void free_append2_(const s_xbt_log_appender_t* this_)
{
-
xbt_log_append2_file_t
data = static_cast<xbt_log_append2_file_t>(this_->data);
+
auto*
data = static_cast<xbt_log_append2_file_t>(this_->data);
if (data->file)
fclose(data->file);
xbt_free(data->filename);
if (data->file)
fclose(data->file);
xbt_free(data->filename);