Changeset 40 for abuse/trunkTweet

Timestamp:

Mar 2, 2008, 12:52:07 AM (15 years ago)

Author:

Sam Hocevar

Message:

• Fix a few more warnings.
• Remove -Wshadow from the warnings because it is too verbose for now.
• Remove warning flags that have no meaning in C++.

Location:

abuse/trunk

Files:

• configure.ac (modified) (1 diff)
• src/dev.cpp (modified) (1 diff)
• src/imlib/gifread.cpp (modified) (2 diffs)
• src/imlib/jmalloc.cpp (modified) (4 diffs)
• src/imlib/targa.cpp (modified) (1 diff)
• src/loader2.cpp (modified) (1 diff)
• src/net/include/tcpip.hpp (modified) (1 diff)
• src/net/tcpip.cpp (modified) (4 diffs)
• src/objects.cpp (modified) (4 diffs)
• src/property.cpp (modified) (1 diff)
• src/view.cpp (modified) (2 diffs)

abuse/trunk/configure.ac

@@ -45 +45 @@
 CPPFLAGS="${CPPFLAGS} -g -O2 -fno-strength-reduce -fomit-frame-pointer"
 # Code qui fait des warnings == code de porc == deux baffes dans ta gueule
-CPPFLAGS="${CPPFLAGS} -Wall -Wpointer-arith -Wcast-align -Wcast-qual -Wstrict-prototypes -Wshadow -Waggregate-return -Wmissing-prototypes -Wnested-externs -Wsign-compare"
+CPPFLAGS="${CPPFLAGS} -Wall -Wpointer-arith -Wcast-align -Wcast-qual -Waggregate-return -Wsign-compare"
 
 dnl Checks for header files

abuse/trunk/src/dev.cpp

@@ -2097 +2097 @@
           if (!mess_win)
           {
-            mess_win=file_dialog(eh,symbol_str("saveas_name"),current_level ? current_level->name() : (char *)"untitled.spe",
+            mess_win=file_dialog(eh,symbol_str("saveas_name"),current_level ? current_level->name() : "untitled.spe",
                                ID_LEVEL_SAVEAS_OK,symbol_str("ok_button"),
                                  ID_CANCEL,symbol_str("cancel_button"),

abuse/trunk/src/imlib/gifread.cpp

@@ -14 +14 @@
 
 
-struct {
+struct GifScreen {
         uint16_t        Width;
         uint16_t        Height;
@@ -24 +24 @@
 } GifScreen;
 
-struct {
+struct gif_screen {
   uint16_t w,h;
   uint8_t color_info,background,reserved;
 } gif_screen;
 
-struct {
+struct gif_image {
   uint16_t xoff,yoff,w,h;
   uint8_t color_info;

abuse/trunk/src/imlib/jmalloc.cpp

@@ -203 +203 @@
   for (;f;f=f->next,i++)
   {    
-    fprintf(fp,"%4d   %p (%d) %4d      ",i,f,((char *)f-(char *)sfirst),f->size);
+    fprintf(fp, "%4d   %p (%ld) %4ld      ",
+            i, f, (long int)((char *)f - (char *)sfirst), (long int)f->size);
 #ifdef MEM_CHECK
     if (f->size>0)
@@ -236 +237 @@
 
 
-  fprintf(fp,"************** CACHE SPACE ******************\n",block_size);
+  fprintf(fp,"************** CACHE SPACE %i ******************\n", block_size);
   i=0;
   for (f=cfirst;f;f=f->next,i++)
@@ -690 +691 @@
     "    DOS users  : Remove any TSR's and device drivers you can.\n"
     "    UNIX users : Do you have a swapfile/partition setup?\n";
+#ifdef __WATCOMC__
 static char const *not_enough_low_memory_message =
     "Memory Manager : Not enough low memory available (%d : need %d)\n"
@@ -696 +698 @@
     "    - remove TSRs & drivers not needed by ABUSE\n"
     "    - add memory to your system\n";
+#endif
 
 void jmalloc_init(int32_t min_size)

abuse/trunk/src/imlib/targa.cpp

@@ -43 +43 @@
   int h=fp->read_uint16();
   uint8_t bpp=fp->read_uint8();
-  uint8_t im_des=fp->read_uint8();
+  fp->read_uint8(); // im_des
 
   if (bpp!=32)

abuse/trunk/src/loader2.cpp

@@ -282 +282 @@
         color_table=NULL;
 
+# if 0
         int should_save_sd_cache = 0;
 
-# if 0
         char *cachepath;
         cachepath = (char *)jmalloc( strlen( get_save_filename_prefix() ) + 12 + 1, "cachepath" );

abuse/trunk/src/net/include/tcpip.hpp

@@ -45 +45 @@
   {
     if (who->protocol_type()==IP &&
-        !memcmp(&addr.sin_addr,& ((ip_address *)who)->addr.sin_addr,sizeof(addr.sin_addr)))
+        !memcmp(&addr.sin_addr,& ((ip_address const *)who)->addr.sin_addr,sizeof(addr.sin_addr)))
       return 1;
     else return 0;

abuse/trunk/src/net/tcpip.cpp

@@ -365 +365 @@
     // got a notification request "broadcast"
     ip_address *addr;
+    net_address *tmp;
 
 #ifdef TCPIP_DEBUG
@@ -370 +371 @@
 #endif
 
-    len = notifier->read(buf, 512, (net_address**)&addr);
+    len = notifier->read(buf, 512, &tmp);
+    addr = (ip_address *)tmp;
 #ifdef TCPIP_DEBUG
                 if (len>0) {
@@ -510 +512 @@
     // got a notification response
     ip_address *addr;
+    net_address *tmp;
 
 #ifdef TCPIP_DEBUG
@@ -515 +518 @@
 #endif
 
-    len = responder->read(buf, 512, (net_address**)&addr);
+    len = responder->read(buf, 512, &tmp);
+    addr = (ip_address *)tmp;
 
 #ifdef TCPIP_DEBUG

abuse/trunk/src/objects.cpp

@@ -268 +268 @@
                 current_object = this;
                 void *m = mark_heap( TMP_SPACE );
-                void *ret = eval_function( (lisp_symbol *)ns, NULL );
+                (void)eval_function( (lisp_symbol *)ns, NULL );
                 restore_heap( m, TMP_SPACE );
         }
@@ -734 +734 @@
   else
   {
-    view *v=controller();
+    //view *v=controller();
 
     if (fade_count())      
@@ -931 +931 @@
     int fxv=sfxvel(),fyv=sfyvel();
     fxv+=fxa;  fyv+=fya;    
-    int32_t xv=xvel()+xa+(fxv>>8); 
+    //int32_t xv=xvel()+xa+(fxv>>8); 
     set_xvel(xvel()+xa+(fxv>>8));
     set_yvel(yvel()+ya+(fyv>>8));
@@ -1453 +1453 @@
     int fxv=sfxvel(),fyv=sfyvel();
     fxv+=fxa;  fyv+=fya;    
-    int32_t xv=xvel()+xa+(fxv>>8); 
+    //int32_t xv=xvel()+xa+(fxv>>8); 
     set_xvel(xvel()+xa+(fxv>>8));
     set_yvel(yvel()+ya+(fyv>>8));

abuse/trunk/src/property.cpp

@@ -131 +131 @@
         fprintf(fp,"\"%s\"\n",i->def_str);
       else
-        fprintf(fp,"%g\n",i->def_num);      
+        fprintf(fp,"%d\n",i->def_num);      
     }
     fclose(fp);

abuse/trunk/src/view.cpp

@@ -169 +169 @@
 
 #ifdef __WATCOMC__
-char *get_login()
+char const *get_login()
 {  if (cur_user_name[0]) return cur_user_name; else return "DOS user"; }
 
@@ -175 +175 @@
 #elif defined( __APPLE__ )
 
-char *get_login()
+char const *get_login()
 {  if (cur_user_name[0]) return cur_user_name; else return "Mac user"; }
 
 #else
-char *get_login()
-{  if (cur_user_name[0]) return cur_user_name; else return (getlogin() ? getlogin() : (char *)"unknown"); }
+char const *get_login()
+{  if (cur_user_name[0]) return cur_user_name; else return (getlogin() ? getlogin() : "unknown"); }
 
 #endif