Mercurial > hg > dmlib
changeset 1606:93d1050eac99
Rename dmf_create_*() functions to dmf_open_*().
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Mon, 14 May 2018 11:20:05 +0300 |
parents | 53482dbdef73 |
children | 0cac3360a0aa |
files | editor/edtlobj.cpp src/dmres.c src/dmres.h src/dmsimple.c tests/plrtest.c tools/dumpmod.c tools/fontconv.c tools/mod2wav.c tools/ppl.c tools/xm2jss.c |
diffstat | 10 files changed, 21 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/editor/edtlobj.cpp Mon May 14 10:53:54 2018 +0300 +++ b/editor/edtlobj.cpp Mon May 14 11:20:05 2018 +0300 @@ -33,7 +33,7 @@ QByteArray fnba = mfilename.toUtf8(); DMResource *res; DMTimeline *tmp; - if ((res = dmf_create_stdio(fnba.data(), "rb")) == NULL) + if ((res = dmf_open_stdio(fnba.data(), "rb")) == NULL) return DMERR_FOPEN; int err = dmLoadTimeline(res, &tmp); @@ -61,7 +61,7 @@ { QByteArray fnba = mfilename.toUtf8(); DMResource *res; - if ((res = dmf_create_stdio(fnba.data(), "wb")) == NULL) + if ((res = dmf_open_stdio(fnba.data(), "wb")) == NULL) return DMERR_FOPEN; int err = dmSaveTimeline(res, tl);
--- a/src/dmres.c Mon May 14 10:53:54 2018 +0300 +++ b/src/dmres.c Mon May 14 11:20:05 2018 +0300 @@ -816,7 +816,7 @@ } -int dmf_create_memio(DMResourceLib *lib, const char *filename, +int dmf_open_memio(DMResourceLib *lib, const char *filename, Uint8 *buf, const size_t size, DMResource **phandle) { DMResource *handle; @@ -841,7 +841,7 @@ #ifdef DM_USE_STDIO -int dmf_create_stdio(const char *filename, const char *mode, DMResource **phandle) +int dmf_open_stdio(const char *filename, const char *mode, DMResource **phandle) { DMResource *handle; if ((*phandle = handle = dmResourceNew(NULL, filename, 0, 0)) == NULL) @@ -862,7 +862,7 @@ } -int dmf_create_stdio_stream(FILE *fh, DMResource **phandle) +int dmf_open_stdio_stream(FILE *fh, DMResource **phandle) { DMResource *handle; if ((*phandle = handle = dmResourceNew(NULL, "", 0, 0)) == NULL)
--- a/src/dmres.h Mon May 14 10:53:54 2018 +0300 +++ b/src/dmres.h Mon May 14 11:20:05 2018 +0300 @@ -151,10 +151,10 @@ int dmf_open(DMResourceLib *lib, const char *, DMResource **handle); void dmf_close(DMResource *); -int dmf_create_memio(DMResourceLib *lib, const char *, Uint8 *buf, size_t len, DMResource **phandle); +int dmf_open_memio(DMResourceLib *lib, const char *, Uint8 *buf, size_t len, DMResource **phandle); #ifdef DM_USE_STDIO -int dmf_create_stdio(const char *filename, const char *mode, DMResource **phandle); -int dmf_create_stdio_stream(FILE *, DMResource **phandle); +int dmf_open_stdio(const char *filename, const char *mode, DMResource **phandle); +int dmf_open_stdio_stream(FILE *, DMResource **phandle); #endif
--- a/src/dmsimple.c Mon May 14 10:53:54 2018 +0300 +++ b/src/dmsimple.c Mon May 14 11:20:05 2018 +0300 @@ -382,7 +382,7 @@ // Fetch and decompress setup image, try regular resources first if ((result = dmf_open(engine.resources, setupImageName, &file)) == DMERR_OK #ifdef DM_BUILT_IN_SETUP - || (result = dmf_create_memio(NULL, setupImageName, setupImage, sizeof(setupImage), &file)) == DMERR_OK + || (result = dmf_open_memio(NULL, setupImageName, setupImage, sizeof(setupImage), &file)) == DMERR_OK #endif ) { @@ -392,7 +392,7 @@ if ((result = dmf_open(engine.resources, setupMenuBarName, &file)) == DMERR_OK #ifdef DM_BUILT_IN_SETUP - || (result = dmf_create_memio(NULL, setupMenuBarName, setupMenuBar, sizeof(setupMenuBar), &file)) == DMERR_OK + || (result = dmf_open_memio(NULL, setupMenuBarName, setupMenuBar, sizeof(setupMenuBar), &file)) == DMERR_OK #endif ) { @@ -423,7 +423,7 @@ // Load up the bitmap font if ((result = dmf_open(engine.resources, setupFontName, &file)) == DMERR_OK #ifdef DM_BUILT_IN_SETUP - || (result = dmf_create_memio(NULL, setupFontName, setupFont, sizeof(setupFont), &file)) == DMERR_OK + || (result = dmf_open_memio(NULL, setupFontName, setupFont, sizeof(setupFont), &file)) == DMERR_OK #endif ) {
--- a/tests/plrtest.c Mon May 14 10:53:54 2018 +0300 +++ b/tests/plrtest.c Mon May 14 11:20:05 2018 +0300 @@ -116,9 +116,9 @@ // Open the files if (inFilename == NULL) - result = dmf_create_stdio_stream(stdin, &file); + result = dmf_open_stdio_stream(stdin, &file); else - result = dmf_create_stdio(inFilename, "rb", &file); + result = dmf_open_stdio(inFilename, "rb", &file); if (result != DMERR_OK) {
--- a/tools/dumpmod.c Mon May 14 10:53:54 2018 +0300 +++ b/tools/dumpmod.c Mon May 14 11:20:05 2018 +0300 @@ -435,9 +435,9 @@ // Open the file dmMsg(1, "Reading module file '%s'\n", optFilename); if (optFilename == NULL) - result = dmf_create_stdio_stream(stdin, &file); + result = dmf_open_stdio_stream(stdin, &file); else - result = dmf_create_stdio(optFilename, "rb", &file); + result = dmf_open_stdio(optFilename, "rb", &file); if (result != DMERR_OK) {
--- a/tools/fontconv.c Mon May 14 10:53:54 2018 +0300 +++ b/tools/fontconv.c Mon May 14 11:20:05 2018 +0300 @@ -298,7 +298,7 @@ #endif // Open the source file - if ((res = dmf_create_stdio(optInFilename, "rb", &inFile)) != DMERR_OK) + if ((res = dmf_open_stdio(optInFilename, "rb", &inFile)) != DMERR_OK) { dmErrorMsg("Error opening input file '%s', %d: %s\n", optInFilename, res, dmErrorStr(res)); @@ -364,7 +364,7 @@ dmMsg(1, "Outputting a DMFONT format bitmap font.\n"); - if ((res = dmf_create_stdio(optOutFilename, "wb", &outFile)) != DMERR_OK) + if ((res = dmf_open_stdio(optOutFilename, "wb", &outFile)) != DMERR_OK) { dmErrorMsg("Error creating file '%s', %d: %s\n", optInFilename, res, dmErrorStr(res));
--- a/tools/mod2wav.c Mon May 14 10:53:54 2018 +0300 +++ b/tools/mod2wav.c Mon May 14 11:20:05 2018 +0300 @@ -153,7 +153,7 @@ jssInit(); // Open the source file - if ((result = dmf_create_stdio(optInFilename, "rb", &inFile)) != DMERR_OK) + if ((result = dmf_open_stdio(optInFilename, "rb", &inFile)) != DMERR_OK) { dmErrorMsg("Error opening input file '%s', %d: %s\n", optInFilename, result, dmErrorStr(result));
--- a/tools/ppl.c Mon May 14 10:53:54 2018 +0300 +++ b/tools/ppl.c Mon May 14 11:20:05 2018 +0300 @@ -557,7 +557,7 @@ return 1; } - if ((result = dmf_create_stdio(optFilename, "rb", &file)) != DMERR_OK) + if ((result = dmf_open_stdio(optFilename, "rb", &file)) != DMERR_OK) { dmErrorMsg("Error opening file '%s', %d: (%s)\n", optFilename, result, dmErrorStr(result)); @@ -606,7 +606,7 @@ } // Get font - result = dmf_create_memio(NULL, "pplfont.fnt", engineSetupFont, sizeof(engineSetupFont), &file); + result = dmf_open_memio(NULL, "pplfont.fnt", engineSetupFont, sizeof(engineSetupFont), &file); if (result != DMERR_OK) { dmErrorMsg("Error opening font file 'pplfont.fnt', #%d: %s\n",
--- a/tools/xm2jss.c Mon May 14 10:53:54 2018 +0300 +++ b/tools/xm2jss.c Mon May 14 11:20:05 2018 +0300 @@ -1167,7 +1167,7 @@ } // Read the source file - if ((result = dmf_create_stdio(optInFilename, "rb", &inFile)) != DMERR_OK) + if ((result = dmf_open_stdio(optInFilename, "rb", &inFile)) != DMERR_OK) { dmErrorMsg("Error opening input file '%s', %d: %s\n", optInFilename, result, dmErrorStr(result));