luke
/
prjxray
mirror of https://github.com/openXC7/prjxray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed bitread FLAGS_o handling 

Signed-off-by: Clifford Wolf <clifford@clifford.at>
Signed-off-by: Tim 'mithro' Ansell <mithro@mithis.com>
This commit is contained in:
Clifford Wolf 2017-11-27 05:18:26 +01:00 committed by Tim 'mithro' Ansell
parent 1b21d3a064
commit 0efe772467
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/bitread.cc
View File

@ -478,7 +478,7 @@ int main(int argc, char **argv)
FILE *f = stdout; FILE *f = stdout;
if (FLAGS_o.c_str() != nullptr) if (!FLAGS_o.empty())
{ {
f = fopen(FLAGS_o.c_str(), "w"); f = fopen(FLAGS_o.c_str(), "w");
@ -488,7 +488,7 @@ int main(int argc, char **argv)
} }
} }
if (FLAGS_o.c_str() == nullptr) if (FLAGS_o.empty())
fprintf(f, "\n"); fprintf(f, "\n");
std::vector<std::vector<bool>> pgmdata; std::vector<std::vector<bool>> pgmdata;
@ -507,7 +507,7 @@ int main(int argc, char **argv)
if (frame_range_begin != frame_range_end && (fid.get_value() < frame_range_begin || frame_range_end <= fid.get_value())) if (frame_range_begin != frame_range_end && (fid.get_value() < frame_range_begin || frame_range_end <= fid.get_value()))
continue; continue;
if (FLAGS_o.c_str() == nullptr) if (FLAGS_o.empty())
printf("Frame 0x%08x (Type=%d Top=%d Row=%d Column=%d Minor=%d%s):\n", fid.get_value(), fid.get_type(), fid.get_topflag(), printf("Frame 0x%08x (Type=%d Top=%d Row=%d Column=%d Minor=%d%s):\n", fid.get_value(), fid.get_type(), fid.get_topflag(),
fid.get_rowaddr(), fid.get_coladdr(), fid.get_minor(), configframes_autoincr.count(fid.get_value()) ? " AUTO_INCREMENT" : ""); fid.get_rowaddr(), fid.get_coladdr(), fid.get_minor(), configframes_autoincr.count(fid.get_value()) ? " AUTO_INCREMENT" : "");
@ -540,12 +540,12 @@ int main(int argc, char **argv)
else else
fprintf(f, "bit_%08x_%03d_%02d\n", fid.get_value(), i, k); fprintf(f, "bit_%08x_%03d_%02d\n", fid.get_value(), i, k);
} }
if (FLAGS_o.c_str() == nullptr) if (FLAGS_o.empty())
fprintf(f, "\n"); fprintf(f, "\n");
} }
else else
{ {
if (FLAGS_o.c_str() != nullptr) if (!FLAGS_o.empty())
fprintf(f, ".frame 0x%08x%s\n", fid.get_value(), configframes_autoincr.count(fid.get_value()) ? " AI" : ""); fprintf(f, ".frame 0x%08x%s\n", fid.get_value(), configframes_autoincr.count(fid.get_value()) ? " AI" : "");
for (int i = 0; i < 101; i++) for (int i = 0; i < 101; i++)
@ -580,7 +580,7 @@ int main(int argc, char **argv)
} }
} }
if (FLAGS_o.c_str() != nullptr) if (!FLAGS_o.empty())
fclose(f); fclose(f);
} }