From 307e39bb22d4f006264be04e0265eab0777e52e7 Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Sun, 7 Jun 2020 19:47:36 +0200 Subject: [PATCH] exposing function --- client/src/fileutils.c | 6 ++---- client/src/fileutils.h | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/client/src/fileutils.c b/client/src/fileutils.c index 3d3175859..6095132aa 100644 --- a/client/src/fileutils.c +++ b/client/src/fileutils.c @@ -225,7 +225,7 @@ static char *filenamemcopy(const char *preferredName, const char *suffix) { return fileName; } -static char *newfilenamemcopy(const char *preferredName, const char *suffix) { +char *newfilenamemcopy(const char *preferredName, const char *suffix) { if (preferredName == NULL) return NULL; if (suffix == NULL) return NULL; uint16_t preferredNameLen = strlen(preferredName); @@ -948,12 +948,10 @@ int loadFileJSONex(const char *preferredName, void *data, size_t maxdatalen, siz if (fileName == NULL) return PM3_EMALLOC; *datalen = 0; - json_t *root; json_error_t error; - int retval = PM3_SUCCESS; - root = json_load_file(fileName, 0, &error); + json_t *root = json_load_file(fileName, 0, &error); if (!root) { PrintAndLogEx(ERR, "ERROR: json " _YELLOW_("%s") " error on line %d: %s", fileName, error.line, error.text); retval = PM3_ESOFT; diff --git a/client/src/fileutils.h b/client/src/fileutils.h index d3d757408..30dc00251 100644 --- a/client/src/fileutils.h +++ b/client/src/fileutils.h @@ -77,6 +77,7 @@ int fileExists(const char *filename); //bool create_path(const char *dirname); //bool setDefaultPath (savePaths_t pathIndex,const char *Path); // set a path in the path list session.defaultPaths +char *newfilenamemcopy(const char *preferredName, const char *suffix); /** * @brief Utility function to save data to a binary file. This method takes a preferred name, but if that