@@ -1,23 +1,20 @@
-all: all-server all-robots
+all:
+clean:
-## ------------------------------------
-## ognuno scrive solo nella sua sezione
-## ------------------------------------
+.PHONY: all clean
-## logic
-all-logic:
-server/testlogic.o: server/testlogic.c server/robotserver.h
-server/robotserver.o: server/robotserver.c server/robotserver.h
+## server
-## graphics
-CFLAGS = -g `pkg-config cairo --cflags` `pkg-config sdl --cflags` -Icommon
+COMMON_CFLAGS = -g -Wuninitialized -O2
+CFLAGS = $(COMMON_CFLAGS) `pkg-config cairo --cflags` `pkg-config sdl --cflags` -Icommon
LDFLAGS = -g `pkg-config cairo --libs` `pkg-config sdl --libs`
-MAIN_SRC = server/main.o server/drawing.o server/field.o common/net_utils.o server/net_commands.o server/net_core.o server/robotserver.o
+MAIN_OBJ = server/main.o server/drawing.o server/field.o common/net_utils.o server/net_commands.o server/net_core.o server/robotserver.o
-all-server: robotserver
-robotserver: $(MAIN_SRC)
- $(CC) -o robotserver $(MAIN_SRC) $(LDFLAGS)
+robotserver: $(MAIN_OBJ)
+ $(CC) -o robotserver $(MAIN_OBJ) $(LDFLAGS)
server/field.o: server/field.c server/drawing.h server/field.h
+server/testlogic.o: server/testlogic.c server/robotserver.h
+server/robotserver.o: server/robotserver.c server/robotserver.h
server/drawing.o: server/drawing.c server/drawing.h
server/net_core.o: server/net_core.c server/robotserver.h common/net_utils.h server/net_defines.h server/field.h
server/net_commands.o: server/net_commands.c server/net_defines.h server/robotserver.h
@@ -35,16 +32,24 @@ robots.a: $(LIBROBOTS_OBJS)
ar cru $@ $(LIBROBOTS_OBJS)
counter: clients/counter.c clients/robots.h robots.a
- $(CC) -o $@ $< -lm robots.a
+ $(CC) $(COMMON_CFLAGS) -o $@ $< -lm robots.a
rabbit: clients/rabbit.c clients/robots.h robots.a
- $(CC) -o $@ $< -lm robots.a
+ $(CC) $(COMMON_CFLAGS) -o $@ $< -lm robots.a
rook: clients/rook.c clients/robots.h robots.a
- $(CC) -o $@ $< -lm robots.a
+ $(CC) $(COMMON_CFLAGS) -o $@ $< -lm robots.a
sniper: clients/sniper.c clients/robots.h robots.a
- $(CC) -o $@ $< -lm robots.a
+ $(CC) $(COMMON_CFLAGS) -o $@ $< -lm robots.a
spot: clients/spot.c clients/robots.h robots.a
- $(CC) -o $@ $< -lm robots.a
+ $(CC) $(COMMON_CFLAGS) -o $@ $< -lm robots.a
+
+
+## overall rules
+
+all: robotserver $(ROBOTS)
+
+clean:
+ rm -f $(ROBOTS) $(LIBROBOTS_OBJS) robots.a robotserver $(MAIN_OBJ)
Makefile
@@ -43,7 +43,6 @@ static int quad = 0;
int
create_client (int fd)
{
- struct pollfd pollfd;
struct robot *r;
if (fd == -1)
@@ -60,9 +59,8 @@ create_client (int fd)
r->color[0] = get_rand_color();
r->color[1] = get_rand_color();
r->color[2] = get_rand_color();
- pollfd.fd = fd;
- fds[current_robots] = pollfd;
+ fds[current_robots].fd = fd;
all_robots[current_robots++] = r;
return 1;
}
@@ -90,6 +88,7 @@ process_robots ()
do {
to_talk = 0;
+ rfd = -1;
for (i = 0; i < max_robots; i++) {
if (fds[i].fd != -1) {
to_talk++;
@@ -192,13 +191,12 @@ server_start (char *hostname, char *port)
ndprintf_die(stderr, "[ERROR] getaddrinf(): couldn't fill the struct!\n");
runp = ai;
-
- while (runp) {
+ do {
sockd = socket(runp->ai_family, runp->ai_socktype, runp->ai_protocol);
if (sockd != -1)
break;
runp = runp->ai_next;
- }
+ } while (runp);
if (sockd == -1)
ndprintf_die(stderr, "[ERROR] socket(): Couldn't create socket!\n");
server/net_core.c
9d48c03514d1126b892d72d734ecd4a657f4f458
Paolo Bonzini
bonzini@gnu.org
http://github.com/bonzini/netrobots/commit/d70c20e70944cf9a182aa64c8651eda5cc5c603f
d70c20e70944cf9a182aa64c8651eda5cc5c603f
2009-04-28T02:18:03-07:00
2009-04-28T02:18:03-07:00
cleanup makefile and work around -Wuninitialized false positives
698d783e901cb2a3b0267f0392bb8ae81c361ad0
Paolo Bonzini
bonzini@gnu.org