Changeset 187 for libcacaTweet

Timestamp:

Nov 16, 2003, 12:26:54 PM (17 years ago)

Author:

Sam Hocevar

Message:

• configure.ac: + Added -Wsign-compare to the warning flags.
• libcaca/caca.c: + Fixed a signed/unsigned bug that caused infinite waits with

ee_set_delay(0).

• src/weapons.c libcaca/graphics.c libcaca/blit.c libcaca/conic.c: + Fixed minor signed/unsigned comparison warnings.

Location:

libcaca/trunk

Files:

• configure.ac (modified) (1 diff)
• libcaca/blit.c (modified) (1 diff)
• libcaca/caca.c (modified) (3 diffs)
• libcaca/conic.c (modified) (1 diff)
• libcaca/graphics.c (modified) (3 diffs)
• src/weapons.c (modified) (2 diffs)

libcaca/trunk/configure.ac

@@ -57 +57 @@
 CFLAGS="${CFLAGS} -g -O2 -fno-strength-reduce -fomit-frame-pointer"
 # Code qui fait des warnings == code de porc == deux baffes dans ta gueule
-CFLAGS="${CFLAGS} -Wall -Wpointer-arith -Wcast-align -Wcast-qual -Wstrict-prototypes -Wshadow -Waggregate-return -Wmissing-prototypes -Wnested-externs"
+CFLAGS="${CFLAGS} -Wall -Wpointer-arith -Wcast-align -Wcast-qual -Wstrict-prototypes -Wshadow -Waggregate-return -Wmissing-prototypes -Wnested-externs -Wsign-compare"
 
 AC_OUTPUT([

libcaca/trunk/libcaca/blit.c

@@ -52 +52 @@
     pitch = (3 * w + 3) / 4 * 4;
 
-    for(y = y1 > 0 ? y1 : 0; y <= y2 && y <= caca_get_height(); y++)
-        for(x = x1 > 0 ? x1 : 0; x <= x2 && x <= caca_get_width(); x++)
+    for(y = y1 > 0 ? y1 : 0; y <= y2 && y <= (int)caca_get_height(); y++)
+        for(x = x1 > 0 ? x1 : 0; x <= x2 && x <= (int)caca_get_width(); x++)
         {
             int fromx = w * (x - x1) / (x2 - x1 + 1);

libcaca/trunk/libcaca/caca.c

@@ -258 +258 @@
 {
 #define IDLE_USEC 10000
-    static unsigned int lastticks = 0;
-    unsigned int ticks = lastticks + _caca_getticks();
+    static int lastticks = 0;
+    int ticks = lastticks + _caca_getticks();
 
 #if defined(USE_SLANG)
@@ -275 +275 @@
     /* Wait until _caca_delay + time of last call */
     ticks += _caca_getticks();
-    for(; ticks < _caca_delay - IDLE_USEC; ticks += _caca_getticks())
+    for(; ticks + IDLE_USEC < (int)_caca_delay; ticks += _caca_getticks())
         usleep(IDLE_USEC);
 
@@ -284 +284 @@
 
     /* If we drifted too much, it's bad, bad, bad. */
-    if(lastticks > _caca_delay)
+    if(lastticks > (int)_caca_delay)
         lastticks = 0;
 }

libcaca/trunk/libcaca/conic.c

@@ -184 +184 @@
     uint8_t b = 0;
 
-    if(xo + x >= 0 && xo + x < caca_get_width())
+    if(xo + x >= 0 && xo + x < (int)caca_get_width())
         b |= 0x1;
-    if(xo - x >= 0 && xo - x < caca_get_width())
+    if(xo - x >= 0 && xo - x < (int)caca_get_width())
         b |= 0x2;
-    if(yo + y >= 0 && yo + y < caca_get_height())
+    if(yo + y >= 0 && yo + y < (int)caca_get_height())
         b |= 0x4;
-    if(yo - y >= 0 && yo - y < caca_get_height())
+    if(yo - y >= 0 && yo - y < (int)caca_get_height())
         b |= 0x8;
 

libcaca/trunk/libcaca/graphics.c

@@ -64 +64 @@
 void caca_putchar(int x, int y, char c)
 {
-    if(x < 0 || x >= caca_get_width() || y < 0 || y >= caca_get_height())
+    if(x < 0 || x >= (int)caca_get_width() ||
+       y < 0 || y >= (int)caca_get_height())
         return;
 
@@ -83 +84 @@
 void caca_putstr(int x, int y, const char *s)
 {
-    int len;
+    unsigned int len;
 
-    if(y < 0 || y >= caca_get_height() || x >= caca_get_width())
+    if(y < 0 || y >= (int)caca_get_height() || x >= (int)caca_get_width())
         return;
 
@@ -130 +131 @@
     va_list args;
 
-    if(y < 0 || y >= caca_get_height() || x >= caca_get_width())
+    if(y < 0 || y >= (int)caca_get_height() || x >= (int)caca_get_width())
         return;
 

libcaca/trunk/src/weapons.c

@@ -50 +50 @@
 void draw_weapons(game *g, weapons *wp)
 {
-    int i;
+    unsigned int i;
 
     for(i = 0; i < WEAPONS; i++)
@@ -96 +96 @@
 void update_weapons(game *g, weapons *wp)
 {
-    int i, j, dist, xmin, ymin, dx, dy, xnew, ynew;
+    unsigned int i, j;
+    int dist, xmin, ymin, dx, dy, xnew, ynew;
 
     for(i = 0; i < WEAPONS; i++)