Cool_Tools/vgmstream
1
0
Fork 0
mirror of https://github.com/vgmstream/vgmstream.git synced 2025-02-17 11:18:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

cleanup: fix crap

Browse Source
This commit is contained in:
bnnm 2024-07-25 19:10:46 +02:00
parent 6fe61717d2
commit 0b2a134c62
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cli/vgmstream_cli.c
View File

@ -230,7 +230,7 @@ static bool parse_config(cli_config_t* cfg, int argc, char** argv) {
goto fail; goto fail;
#ifdef HAVE_JSON #ifdef HAVE_JSON
case 'V': case 'V':
print_json_version(); print_json_version(VGMSTREAM_VERSION);
goto fail; goto fail;
case 'I': case 'I':
cfg->print_metajson = true; cfg->print_metajson = true;
@ -576,7 +576,7 @@ static bool convert_file(cli_config_t* cfg) {
#ifdef HAVE_JSON #ifdef HAVE_JSON
} }
else { else {
print_json_info(vgmstream, cfg); print_json_info(vgmstream, cfg, VGMSTREAM_VERSION);
} }
#endif #endif

4
cli/vgmstream_cli.h
View File

@ -69,8 +69,8 @@ void print_tags(cli_config_t* cfg);
void print_title(VGMSTREAM* vgmstream, cli_config_t* cfg); void print_title(VGMSTREAM* vgmstream, cli_config_t* cfg);
#ifdef HAVE_JSON #ifdef HAVE_JSON
void print_json_version(); void print_json_version(const char* vgmstream_version);
void print_json_info(VGMSTREAM* vgmstream, cli_config_t* cfg); void print_json_info(VGMSTREAM* vgm, cli_config_t* cfg, const char* vgmstream_version);
#endif #endif

8
cli/vgmstream_cli_utils.c
View File

@ -184,7 +184,7 @@ void print_title(VGMSTREAM* vgmstream, cli_config_t* cfg) {
} }
#ifdef HAVE_JSON #ifdef HAVE_JSON
void print_json_version() { void print_json_version(const char* vgmstream_version) {
size_t extension_list_len; size_t extension_list_len;
size_t common_extension_list_len; size_t common_extension_list_len;
const char** extension_list; const char** extension_list;
@ -205,7 +205,7 @@ void print_json_version() {
json_array_append(cext_list, cext); json_array_append(cext_list, cext);
} }
json_t* version_string = json_string(VGMSTREAM_VERSION); json_t* version_string = json_string(vgmstream_version);
json_t* final_object = json_object(); json_t* final_object = json_object();
json_object_set(final_object, "version", version_string); json_object_set(final_object, "version", version_string);
@ -219,8 +219,8 @@ void print_json_version() {
json_dumpf(final_object, stdout, JSON_COMPACT); json_dumpf(final_object, stdout, JSON_COMPACT);
} }
void print_json_info(VGMSTREAM* vgm, cli_config_t* cfg) { void print_json_info(VGMSTREAM* vgm, cli_config_t* cfg, const char* vgmstream_version) {
json_t* version_string = json_string(VGMSTREAM_VERSION); json_t* version_string = json_string(vgmstream_version);
vgmstream_info info; vgmstream_info info;
describe_vgmstream_info(vgm, &info); describe_vgmstream_info(vgm, &info);