From 7c10f43564621e66b79625539c3490a443e794b7 Mon Sep 17 00:00:00 2001 From: Vitaly Novichkov Date: Mon, 25 Jun 2018 15:09:37 +0300 Subject: VLC Plugin: more controls! #38 --- utils/gen_adldata/gen_adldata.cc | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'utils/gen_adldata') diff --git a/utils/gen_adldata/gen_adldata.cc b/utils/gen_adldata/gen_adldata.cc index bc5c231..d03ad09 100644 --- a/utils/gen_adldata/gen_adldata.cc +++ b/utils/gen_adldata/gen_adldata.cc @@ -476,18 +476,20 @@ int main(int argc, char**argv) std::fprintf(outFile, "\n\n//Returns total number of generated banks\n" "int maxAdlBanks()\n" - "{" + "{\n" " return %u;\n" "}\n\n" - "const char* const banknames[%u] =\n", (unsigned int)bankcount, (unsigned int)bankcount); + "const char* const banknames[%u] =\n", + (unsigned int)bankcount, + (unsigned int)(bankcount + 1)); std::fprintf(outFile, "{\n"); - for(unsigned bank = 0; bank < bankcount; ++bank) + for(size_t bank = 0; bank < bankcount; ++bank) std::fprintf(outFile, " \"%s\",\n", banknames[bank].c_str()); - std::fprintf(outFile, "};\n"); + std::fprintf(outFile, " NULL\n};\n"); std::fprintf(outFile, "const unsigned short banks[%u][256] =\n", (unsigned int)bankcount); std::fprintf(outFile, "{\n"); - for(unsigned bank = 0; bank < bankcount; ++bank) + for(size_t bank = 0; bank < bankcount; ++bank) { #ifdef ADLDATA_WITH_COMMENTS std::fprintf(outFile, " { // bank %u, %s\n", bank, banknames[bank].c_str()); @@ -497,7 +499,7 @@ int main(int argc, char**argv) #ifdef ADLDATA_WITH_COMMENTS bool redundant = true; #endif - for(unsigned p = 0; p < 256; ++p) + for(size_t p = 0; p < 256; ++p) { size_t v = bank_data[bank][p]; if(listed.find(v) == listed.end()) -- cgit v1.2.3