fix sock_connect() to return -1 on all errors (Frederick Nacino)

This commit is contained in:
marschap
2006-05-07 10:08:31 +00:00
parent 656c5d8858
commit 5fc4dfc562
5 changed files with 5 additions and 5 deletions
+1 -1
View File
@@ -226,7 +226,7 @@ int connect_and_setup()
report(RPT_INFO, "Connecting to %s:%d", address, port);
sock = sock_connect(address, port);
if (sock <= 0) {
if (sock < 0) {
return -1;
}
+1 -1
View File
@@ -138,7 +138,7 @@ main (int argc, char **argv)
/* Try to connect to server */
sock = sock_connect(server, port);
if (sock <= 0) { /* there was some error and exit */
if (sock < 0) { /* there was some error and exit */
fprintf(stderr, "Error: Could not connect to %s:%d\n", server, port);
exit(0);
}
+1 -1
View File
@@ -278,7 +278,7 @@ fprintf(stderr, "%s%s\n", (state) ? "" : "!", name);
// Connect to the server...
usleep(500000); // wait for the server to start up
sock = sock_connect(server, port);
if (sock <= 0) {
if (sock < 0) {
fprintf(stderr, "Error connecting to LCD server %s on port %d.\n"
"Check to see that the server is running and operating normally.\n",
server, port);
+1 -1
View File
@@ -41,7 +41,7 @@ int connect_and_setup()
report(RPT_INFO, "Connecting to %s:%d", address, port);
sock = sock_connect(address, port);
if (sock <= 0) {
if (sock < 0) {
report(RPT_ERR, "Connecting to %s:%d failed", address, port);
return -1;
}
+1 -1
View File
@@ -82,7 +82,7 @@ sock_connect (char *host, unsigned short int port)
#endif
report (RPT_ERR, "sock_connect: connect failed");
shutdown (sock, SHUT_RDWR);
return 0; // Normal exit if server doesn't exist...
return -1;
}
#ifndef WINSOCK2