diff options
| author | Mattias Andrée <maandree@operamail.com> | 2014-12-09 13:15:10 +0100 |
|---|---|---|
| committer | Mattias Andrée <maandree@operamail.com> | 2014-12-09 13:15:10 +0100 |
| commit | 7a994c9631c590d6a73c842fa5d2d3567b4771dd (patch) | |
| tree | 228ade01f99ba217151a0ed20f29c5f3a5028619 /src/mds-kbdc/mds-kbdc.c | |
| parent | mds-kbdc: compile-layout: macro_call: fix bug: do not duplicate the arguments if there are none (diff) | |
| parent | report an error, rather than causing failure the caller but not for the called function (diff) | |
| download | mds-7a994c9631c590d6a73c842fa5d2d3567b4771dd.tar.gz mds-7a994c9631c590d6a73c842fa5d2d3567b4771dd.tar.bz2 mds-7a994c9631c590d6a73c842fa5d2d3567b4771dd.tar.xz | |
merge track-errors and resolve conflict
Signed-off-by: Mattias Andrée <maandree@operamail.com>
Diffstat (limited to '')
| -rw-r--r-- | src/mds-kbdc/mds-kbdc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mds-kbdc/mds-kbdc.c b/src/mds-kbdc/mds-kbdc.c index ed690a7..33b97b2 100644 --- a/src/mds-kbdc/mds-kbdc.c +++ b/src/mds-kbdc/mds-kbdc.c @@ -85,7 +85,7 @@ int main(int argc_, char** argv_) mds_kbdc_parsed_destroy(&result); return fatal; - pfail: + fail: xperror(*argv); mds_kbdc_parsed_destroy(&result); return 1; |