diff options
| author | Micael Karlberg <[email protected]> | 2011-04-12 18:09:11 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-04-12 18:09:11 +0200 |
| commit | a0c01db642374fb9fbbbb47263929f1e442e20d7 (patch) | |
| tree | 4a080c6a416eeaddbfdfca343d3f3d898639b289 /erts/etc | |
| parent | 4346b5dae76052e8c06b1cda70d561b10c1c486d (diff) | |
| parent | 47fc3df88eada4b07d8805dbc7fd418f6fac1c11 (diff) | |
| download | otp-a0c01db642374fb9fbbbb47263929f1e442e20d7.tar.gz otp-a0c01db642374fb9fbbbb47263929f1e442e20d7.tar.bz2 otp-a0c01db642374fb9fbbbb47263929f1e442e20d7.zip | |
Merge branch 'dev' into bmk/inets/inet56_integration
Diffstat (limited to 'erts/etc')
| -rw-r--r-- | erts/etc/unix/to_erl.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/erts/etc/unix/to_erl.c b/erts/etc/unix/to_erl.c index 886b301997..b7c3c956c6 100644 --- a/erts/etc/unix/to_erl.c +++ b/erts/etc/unix/to_erl.c @@ -125,7 +125,7 @@ static void usage(char *pname) int main(int argc, char **argv) { char FIFO1[FILENAME_MAX], FIFO2[FILENAME_MAX]; - int i, len, wfd, rfd, result = 0; + int i, len, wfd, rfd; fd_set readfds; char buf[BUFSIZ]; char pipename[FILENAME_MAX]; @@ -367,7 +367,6 @@ int main(int argc, char **argv) } else { fprintf(stderr, "Error in select.\n"); - result = -1; break; } } @@ -398,7 +397,6 @@ int main(int argc, char **argv) close(wfd); if (len < 0) { fprintf(stderr, "Error in reading from stdin.\n"); - result = -1; } else { fprintf(stderr, "[EOF]\n\r"); } @@ -420,7 +418,6 @@ int main(int argc, char **argv) fprintf(stderr, "Error in writing to FIFO.\n"); close(rfd); close(wfd); - result = -1; break; } STATUS("\" OK\r\n"); @@ -447,7 +444,6 @@ int main(int argc, char **argv) close(wfd); if (len < 0) { fprintf(stderr, "Error in reading from FIFO.\n"); - result = -1; } else fprintf(stderr, "[End]\n\r"); break; @@ -456,7 +452,6 @@ int main(int argc, char **argv) if ((len=version_handshake(buf,len,wfd)) < 0) { close(rfd); close(wfd); - result = -1; break; } if (protocol_ver >= 1) { @@ -475,7 +470,6 @@ int main(int argc, char **argv) fprintf(stderr, "Error in writing to terminal.\n"); close(rfd); close(wfd); - result = -1; break; } STATUS("\" OK\r\n"); |