diff options
author | 2016-08-21 12:47:37 -0400 | |
---|---|---|
committer | 2016-08-21 12:47:37 -0400 | |
commit | 0931cbafb02f9c842cbff8d1f9100cc943bb07dc (patch) | |
tree | ea73bb143cc3d336764da17ef1981695f14b3274 | |
parent | 16d4c4e358c326c160e1d14570be1bf8ea991b28 (diff) |
castool fix
-rw-r--r-- | src/tools/castool.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tools/castool.cpp b/src/tools/castool.cpp index a6b5c190b72..8fc9d3bd911 100644 --- a/src/tools/castool.cpp +++ b/src/tools/castool.cpp @@ -125,13 +125,13 @@ const struct SupportedCassetteFormats formats[] = { }; -static const char *get_extension(const char *name) +static std::string get_extension(const char *name) { const char *s; s = name; if (s != nullptr) s = strrchr(s, '.'); - return s ? s+1 : nullptr; + return s ? std::string(s+1) : ""; } static void display_usage(void) @@ -190,7 +190,7 @@ int CLIB_DECL main(int argc, char *argv[]) return -1; } - if (cassette_open_choices(f, &stdio_ioprocs, get_extension(argv[3]), selected_formats, CASSETTE_FLAG_READONLY, &cassette)) { + if (cassette_open_choices(f, &stdio_ioprocs, get_extension(argv[3]), selected_formats, CASSETTE_FLAG_READONLY, &cassette) != cassette_image::error::SUCCESS) { fprintf(stderr, "Invalid format of input file.\n"); fclose(f); return -1; |