summaryrefslogtreecommitdiffstatshomepage
path: root/src/tools
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2015-04-19 12:08:52 +0200
committer Miodrag Milanovic <mmicko@gmail.com>2015-04-19 12:08:52 +0200
commit71c4d9f30460914a6823880e88e446799ecfe30f (patch)
tree4718c76a34a5aa2c160c381ab13cf1fa5cca99d7 /src/tools
parent337342a4c650f38d286a3347b670fbc7ee2c343f (diff)
removed bool conversion and implicit empty check (nw)
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/chdman.c2
-rw-r--r--src/tools/split.c2
-rw-r--r--src/tools/src2html.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/src/tools/chdman.c b/src/tools/chdman.c
index a416772729d..4e73fc5f9f8 100644
--- a/src/tools/chdman.c
+++ b/src/tools/chdman.c
@@ -320,7 +320,7 @@ public:
if (offset >= startoffs && offset < endoffs)
{
// if we don't already have this file open, open it now
- if (m_file == NULL || m_lastfile != m_info.track[tracknum].fname)
+ if (m_file == NULL || m_lastfile.cmp(m_info.track[tracknum].fname)!=0)
{
if (m_file != NULL)
core_fclose(m_file);
diff --git a/src/tools/split.c b/src/tools/split.c
index 4e3d93c8bb8..8f598064ffd 100644
--- a/src/tools/split.c
+++ b/src/tools/split.c
@@ -318,7 +318,7 @@ static int join_file(const char *filename, const char *outname, int write_output
compute_hash_as_string(computedhash, splitbuffer, length);
// compare
- if (computedhash != expectedhash)
+ if (computedhash.cmp(expectedhash)!=0)
{
printf("\n");
fprintf(stderr, "Fatal error: file '%s' has incorrect hash\n Expected: %s\n Computed: %s\n", infilename.c_str(), expectedhash.c_str(), computedhash.c_str());
diff --git a/src/tools/src2html.c b/src/tools/src2html.c
index 7d0c55fa6c0..57bdbd9ba9b 100644
--- a/src/tools/src2html.c
+++ b/src/tools/src2html.c
@@ -423,7 +423,7 @@ static int recurse_dir(int srcrootlen, int dstrootlen, astring &srcdir, astring
dstfile.printf("%s%c%s.html", dstdir.c_str(), PATH_SEPARATOR[0], curlist->name.c_str());
if (indexfile != NULL)
core_fprintf(indexfile, "\t<li><a href=\"%s.html\">%s</a></li>\n", curlist->name.c_str(), curlist->name.c_str());
- result = output_file(type, srcrootlen, dstrootlen, srcfile, dstfile, srcdir == dstdir, tempheader, tempfooter);
+ result = output_file(type, srcrootlen, dstrootlen, srcfile, dstfile, srcdir.cmp(dstdir)==0, tempheader, tempfooter);
}
}
@@ -879,7 +879,7 @@ static bool find_include_file(astring &srcincpath, int srcrootlen, int dstrootle
astring tempinc(srcincpath, 0, sepindex);
// if we don't match, stop
- if (tempfile != tempinc)
+ if (tempfile.cmp(tempinc)!=0)
break;
lastsepindex = sepindex + 1;
}