JIANG/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

Adding tests for gettitle and saveinpfile

Browse Source
This commit is contained in:
Michael Tryby
2019-02-28 08:11:59 -05:00
parent ab536d1927
commit c7d533c6e4
4 changed files with 69 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/epanet.c
View File

@@ -247,9 +247,9 @@ int DLLEXPORT EN_gettitle(EN_Project p, char *line1, char *line2, char *line3)
*/
{
if (!p->Openflag) return 102;
strcpy(line1, p->Title[0]);
strcpy(line2, p->Title[1]);
strcpy(line3, p->Title[2]);
strncpy(line1, p->Title[0], TITLELEN);
strncpy(line2, p->Title[1], TITLELEN);
strncpy(line3, p->Title[2], TITLELEN);
return 0;
}
@@ -265,7 +265,7 @@ int DLLEXPORT EN_settitle(EN_Project p, char *line1, char *line2, char *line3)
strncpy(p->Title[0], line1, TITLELEN);
strncpy(p->Title[1], line2, TITLELEN);
strncpy(p->Title[2], line3, TITLELEN);
return 123;
return 0;
}
int DLLEXPORT EN_getcount(EN_Project p, int object, int *count)

2
src/input2.c
View File

@@ -272,7 +272,7 @@ int newline(Project *pr, int sect, char *line)
{
n = (int)strlen(line);
if (line[n - 1] == 10)
line[n - 1] = ' ';
line[n - 1] = '\0';
strncpy(pr->Title[parser->Ntitle], line, TITLELEN);
parser->Ntitle++;
}