epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Convert inputFile.filename to std::string

Browse Source
This commit is contained in:
Martin Konrad
2019-01-05 16:08:55 -05:00
parent e461d782f4
commit b518ebe85b
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/ioc/dbtemplate/msi.cpp
View File

@@ -371,7 +371,7 @@ endcmd:
}
typedef struct inputFile {
char *filename;
std::string filename;
FILE *fp;
int lineNum;
} inputFile;
@@ -482,8 +482,8 @@ static void inputErrPrint(const inputData *const pinputData)
while (inFileIt != inFileList.end()) {
fprintf(stderr, "line %d of ", inFileIt->lineNum);
if (inFileIt->filename) {
fprintf(stderr, " file %s\n", inFileIt->filename);
if (!inFileIt->filename.empty()) {
fprintf(stderr, " file %s\n", inFileIt->filename.c_str());
}
else {
fprintf(stderr, "stdin:\n");
@@ -546,14 +546,15 @@ static void inputOpenFile(inputData *pinputData, const char * const filename)
inFile.filename = fullname;
}
else if (filename) {
inFile.filename = epicsStrDup(filename);
inFile.filename = filename;
}
else {
inFile.filename = epicsStrDup("stdin");
inFile.filename = "stdin";
}
free(fullname);
if (opt_D) {
int hash = epicsStrHash(inFile.filename, 12345);
int hash = epicsStrHash(inFile.filename.c_str(), 12345);
int i = 0;
int match = 0;
@@ -566,7 +567,7 @@ static void inputOpenFile(inputData *pinputData, const char * const filename)
if (!match) {
const char *wrap = numDeps ? " \\\n" : "";
printf("%s %s", wrap, inFile.filename);
printf("%s %s", wrap, inFile.filename.c_str());
if (numDeps < MAX_DEPS) {
depHashes[numDeps++] = hash;
}
@@ -589,8 +590,7 @@ static void inputCloseFile(inputData *pinputData)
if(!inFileList.empty()) {
inputFile& inFile = inFileList.front();
if (fclose(inFile.fp))
fprintf(stderr, "msi: Can't close input file '%s'\n", inFile.filename);
free(inFile.filename);
fprintf(stderr, "msi: Can't close input file '%s'\n", inFile.filename.c_str());
inFileList.erase(inFileList.begin());
}
EXIT;