From: Tobias Burnus Date: Mon, 11 Mar 2013 18:55:18 +0000 (+0100) Subject: transfer.c (read_block_direct): Correct condition. X-Git-Tag: releases/gcc-4.8.0~102 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=43b594b4c21ef51f56f95e29f4187db2a5841e9c;p=thirdparty%2Fgcc.git transfer.c (read_block_direct): Correct condition. 2013-03-11 Tobias Burnus * io/transfer.c (read_block_direct): Correct condition. * intrinsics/execute_command_line.c (execute_command_line): Remove dead code for the HAVE_FORK case. From-SVN: r196603 --- diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 54ac5738c014..5412835903a1 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,9 @@ +2013-03-11 Tobias Burnus + + * io/transfer.c (read_block_direct): Correct condition. + * intrinsics/execute_command_line.c (execute_command_line): + Remove dead code for the HAVE_FORK case. + 2013-02-21 Janne Blomqvist PR libfortran/30162 diff --git a/libgfortran/intrinsics/execute_command_line.c b/libgfortran/intrinsics/execute_command_line.c index d0f812dcacd5..fa6ea9fbc34c 100644 --- a/libgfortran/intrinsics/execute_command_line.c +++ b/libgfortran/intrinsics/execute_command_line.c @@ -94,8 +94,10 @@ execute_command_line (const char *command, bool wait, int *exitstat, if (res == -1) set_cmdstat (cmdstat, EXEC_SYSTEMFAILED); +#ifndef HAVE_FORK else if (!wait) set_cmdstat (cmdstat, EXEC_SYNCHRONOUS); +#endif else set_cmdstat (cmdstat, EXEC_NOERROR); diff --git a/libgfortran/io/transfer.c b/libgfortran/io/transfer.c index 515c34f378ed..d97a325a772d 100644 --- a/libgfortran/io/transfer.c +++ b/libgfortran/io/transfer.c @@ -641,7 +641,7 @@ read_block_direct (st_parameter_dt *dtp, void *buf, size_t nbytes) have_read_subrecord = sread (dtp->u.p.current_unit->s, buf + have_read_record, to_read_subrecord); - if (unlikely (have_read_subrecord) < 0) + if (unlikely (have_read_subrecord < 0)) { generate_error (&dtp->common, LIBERROR_OS, NULL); return;