mangavalk/lcdproc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing some compile time problems that showed up using gcc 2.95 under

Browse Source 
Solaris 8 (first time on SF Compile Farm!)
This commit is contained in:
ddouthitt
2001-09-27 13:49:04 +00:00
parent d67120f519
commit 897133efdd
2 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/client_functions.c
+20 -8
View File
@@ -901,7 +901,8 @@ widget_set_func (client * c, int argc, char **argv)
if (argc != i + 3) if (argc != i + 3)
sock_send_string (c->sock, "huh? Wrong number of arguments\n"); sock_send_string (c->sock, "huh? Wrong number of arguments\n");
else { else {
if ((!isdigit (argv[i][0])) || (!isdigit (argv[i + 1][0]))) { if ((!isdigit ((unsigned int) argv[i][0])) ||
(!isdigit ((unsigned int) argv[i + 1][0]))) {
sock_send_string (c->sock, "huh? Invalid coordinates\n"); sock_send_string (c->sock, "huh? Invalid coordinates\n");
} else // Set all the data... } else // Set all the data...
{ {
@@ -925,7 +926,8 @@ widget_set_func (client * c, int argc, char **argv)
if (argc != i + 3) if (argc != i + 3)
sock_send_string (c->sock, "huh? Wrong number of arguments\n"); sock_send_string (c->sock, "huh? Wrong number of arguments\n");
else { else {
if ((!isdigit (argv[i][0])) || (!isdigit (argv[i + 1][0]))) { if ((!isdigit ((unsigned int) argv[i][0])) ||
(!isdigit ((unsigned int) argv[i + 1][0]))) {
sock_send_string (c->sock, "huh? Invalid coordinates\n"); sock_send_string (c->sock, "huh? Invalid coordinates\n");
} else { } else {
x = atoi (argv[i]); x = atoi (argv[i]);
@@ -943,7 +945,8 @@ widget_set_func (client * c, int argc, char **argv)
if (argc != i + 3) if (argc != i + 3)
sock_send_string (c->sock, "huh? Wrong number of arguments\n"); sock_send_string (c->sock, "huh? Wrong number of arguments\n");
else { else {
if ((!isdigit (argv[i][0])) || (!isdigit (argv[i + 1][0]))) { if ((!isdigit ((unsigned int) argv[i][0])) ||
(!isdigit ((unsigned int) argv[i + 1][0]))) {
sock_send_string (c->sock, "huh? Invalid coordinates\n"); sock_send_string (c->sock, "huh? Invalid coordinates\n");
} else { } else {
x = atoi (argv[i]); x = atoi (argv[i]);
@@ -961,7 +964,8 @@ widget_set_func (client * c, int argc, char **argv)
if (argc != i + 3) if (argc != i + 3)
sock_send_string (c->sock, "huh? Wrong number of arguments\n"); sock_send_string (c->sock, "huh? Wrong number of arguments\n");
else { else {
if ((!isdigit (argv[i][0])) || (!isdigit (argv[i + 1][0]))) { if ((!isdigit ((unsigned int) argv[i][0])) ||
(!isdigit ((unsigned int) argv[i + 1][0]))) {
sock_send_string (c->sock, "huh? Invalid coordinates\n"); sock_send_string (c->sock, "huh? Invalid coordinates\n");
} else { } else {
x = atoi (argv[i]); x = atoi (argv[i]);
@@ -992,7 +996,10 @@ widget_set_func (client * c, int argc, char **argv)
if (argc != i + 7) { if (argc != i + 7) {
sock_send_string (c->sock, "huh? Wrong number of arguments\n"); sock_send_string (c->sock, "huh? Wrong number of arguments\n");
} else { } else {
if ((!isdigit (argv[i][0])) || (!isdigit (argv[i + 1][0])) || (!isdigit (argv[i + 2][0])) || (!isdigit (argv[i + 3][0]))) { if ((!isdigit ((unsigned int) argv[i][0])) ||
(!isdigit ((unsigned int) argv[i + 1][0])) ||
(!isdigit ((unsigned int) argv[i + 2][0])) ||
(!isdigit ((unsigned int) argv[i + 3][0]))) {
sock_send_string (c->sock, "huh? Invalid coordinates\n"); sock_send_string (c->sock, "huh? Invalid coordinates\n");
} else { } else {
left = atoi (argv[i]); left = atoi (argv[i]);
@@ -1035,7 +1042,12 @@ widget_set_func (client * c, int argc, char **argv)
if (argc != i + 8) { if (argc != i + 8) {
sock_send_string (c->sock, "huh? Wrong number of arguments\n"); sock_send_string (c->sock, "huh? Wrong number of arguments\n");
} else { } else {
if ((!isdigit (argv[i][0])) || (!isdigit (argv[i + 1][0])) || (!isdigit (argv[i + 2][0])) || (!isdigit (argv[i + 3][0])) || (!isdigit (argv[i + 4][0])) || (!isdigit (argv[i + 5][0]))) { if ((!isdigit ((unsigned int) argv[i][0])) ||
(!isdigit ((unsigned int) argv[i + 1][0])) ||
(!isdigit ((unsigned int) argv[i + 2][0])) ||
(!isdigit ((unsigned int) argv[i + 3][0])) ||
(!isdigit ((unsigned int) argv[i + 4][0])) ||
(!isdigit ((unsigned int) argv[i + 5][0]))) {
sock_send_string (c->sock, "huh? Invalid coordinates\n"); sock_send_string (c->sock, "huh? Invalid coordinates\n");
} else { } else {
left = atoi (argv[i]); left = atoi (argv[i]);
@@ -1076,9 +1088,9 @@ widget_set_func (client * c, int argc, char **argv)
if (argc != i + 2) if (argc != i + 2)
sock_send_string (c->sock, "huh? Wrong number of arguments\n"); sock_send_string (c->sock, "huh? Wrong number of arguments\n");
else { else {
if (!isdigit (argv[i][0])) { if (!isdigit ((unsigned int) argv[i][0])) {
sock_send_string (c->sock, "huh? Invalid coordinates\n"); sock_send_string (c->sock, "huh? Invalid coordinates\n");
} else if (!isdigit (argv[i + 1][0])) { } else if (!isdigit ((unsigned int) argv[i + 1][0])) {
sock_send_string (c->sock, "huh? Invalid number\n"); sock_send_string (c->sock, "huh? Invalid number\n");
} else { } else {
x = atoi (argv[i]); x = atoi (argv[i]);
server/sock.c
+1
View File
@@ -12,6 +12,7 @@
#include <sys/socket.h> #include <sys/socket.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <fcntl.h> #include <fcntl.h>
#include <string.h>
#include "shared/sockets.h" #include "shared/sockets.h"
#include "sock.h" #include "sock.h"