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
Use simgrid::xbt::Path instead of xbt_{base,dir}name in C++ files.
[simgrid.git]
/
src
/
mc
/
remote
/
RemoteClient.cpp
diff --git
a/src/mc/remote/RemoteClient.cpp
b/src/mc/remote/RemoteClient.cpp
index
92a3955
..
297c545
100644
(file)
--- a/
src/mc/remote/RemoteClient.cpp
+++ b/
src/mc/remote/RemoteClient.cpp
@@
-28,6
+28,7
@@
#include <libunwind.h>
#include "xbt/base.h"
#include <libunwind.h>
#include "xbt/base.h"
+#include "xbt/file.hpp"
#include "xbt/log.h"
#include <xbt/mmalloc.h>
#include "xbt/log.h"
#include <xbt/mmalloc.h>
@@
-118,17
+119,13
@@
struct s_mc_memory_map_re {
static char* get_lib_name(const char* pathname, s_mc_memory_map_re* res)
{
static char* get_lib_name(const char* pathname, s_mc_memory_map_re* res)
{
-
char* map_basename = xbt_basename(pathname
);
+
std::string map_basename = simgrid::xbt::Path(pathname).getBasename(
);
regmatch_t match;
regmatch_t match;
- if (regexec(&res->so_re, map_basename, 1, &match, 0)) {
- free(map_basename);
+ if (regexec(&res->so_re, map_basename.c_str(), 1, &match, 0))
return nullptr;
return nullptr;
- }
- char* libname = strndup(map_basename, match.rm_so);
- free(map_basename);
- map_basename = nullptr;
+ char* libname = strndup(map_basename.c_str(), match.rm_so);
// Strip the version suffix:
if (libname && not regexec(&res->version_re, libname, 1, &match, 0)) {
// Strip the version suffix:
if (libname && not regexec(&res->version_re, libname, 1, &match, 0)) {