diff options
| author | 2015-12-28 11:27:47 +0100 | |
|---|---|---|
| committer | 2015-12-28 11:27:47 +0100 | |
| commit | 2a5e044fc23624a388bdb5f82ef9c11cbed6a9c7 (patch) | |
| tree | b468f54cdcbb7252d14790a7a013b138b1bd9b03 /src/tools/unidasm.cpp | |
| parent | 077fe7ad89d65bbeafde141c9b3f71ca8df42f1c (diff) | |
| parent | 11fcbaa28583023ea93a8f0c1f3fb9082d3295ab (diff) | |
Merge https://github.com/mamedev/mame
# Conflicts:
# src/devices/video/ef9365.cpp
Diffstat (limited to 'src/tools/unidasm.cpp')
| -rw-r--r-- | src/tools/unidasm.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tools/unidasm.cpp b/src/tools/unidasm.cpp index 7a245886d6a..13eabe31c59 100644 --- a/src/tools/unidasm.cpp +++ b/src/tools/unidasm.cpp @@ -454,7 +454,7 @@ static int parse_options(int argc, char *argv[], options *opts) } // filename - else if (opts->filename == NULL) + else if (opts->filename == nullptr) opts->filename = curarg; // fail @@ -467,7 +467,7 @@ static int parse_options(int argc, char *argv[], options *opts) goto usage; // if no file or no architecture, fail - if (opts->filename == NULL || opts->dasm == NULL) + if (opts->filename == nullptr || opts->dasm == nullptr) goto usage; return 0; @@ -545,7 +545,7 @@ int main(int argc, char *argv[]) int numchunks; // disassemble - pcdelta = (*opts.dasm->func)(NULL, buffer, curpc, oprom, oprom, opts.mode) & DASMFLAG_LENGTHMASK; + pcdelta = (*opts.dasm->func)(nullptr, buffer, curpc, oprom, oprom, opts.mode) & DASMFLAG_LENGTHMASK; if (opts.dasm->pcshift < 0) numbytes = pcdelta << -opts.dasm->pcshift; |
