[Freeciv-Dev] Re: (PR#2534) civclient crash on FreeBSD 5.0

["Jason Short via RT" <rt@xxxxxxxxxxxxxx>]

On Thu, 2002-12-12 at 21:04, mwlucas@xxxxxxxxxxxxxxxxxxxx via RT wrote:
> On Thu, Dec 12, 2002 at 05:50:57PM -0800, Jason Short via RT wrote:
> > On Thu, 2002-12-12 at 17:16, mwlucas@xxxxxxxxxxxxxxxxxxxx via RT wrote:
> > > BTW, I tried the beta of 1.14.0.  Same behaviour.
> > > 
> > > Thanks for all your help!
> > 
> > Try this patch.
> 
> Sorry, core dumped again.  Appending backtrace below.  Looks pretty
> similar, but what do I know?

This is promising.

Try this patch (it is an extension to the previous patch and will
probably conflict).  (I did not realize this function was called outside
of dialogs.c.)

BTW: I'd suggest you move to the CVS version for debugging.  It makes
passing patches around easier.  See
http://freeciv.org/contribute.html#SetupCVS.

jason


? client/gui-sdl/.deps
? client/gui-sdl/Freeciv.h
? client/gui-sdl/Makefile
? client/gui-sdl/Makefile.in
Index: client/gui-gtk/citydlg.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk/citydlg.c,v
retrieving revision 1.140
diff -u -r1.140 citydlg.c
--- client/gui-gtk/citydlg.c    2002/06/19 02:18:00     1.140
+++ client/gui-gtk/citydlg.c    2002/12/13 02:49:04
@@ -2474,8 +2474,7 @@
                         punit->id, _("Activate unit, _close dialog"),
                         supported_unit_activate_close_callback, punit->id,
                         _("_Disband unit"), unit_disband_callback,
-                        punit->id, _("_Cancel"), NULL, 0,
-                        0);
+                        punit->id, _("_Cancel"), NULL, NULL, NULL);
   }
   return TRUE;
 }
@@ -2513,7 +2512,7 @@
                              unit_homecity_callback, punit->id,
                              _("_Upgrade unit"), unit_upgrade_callback,
                              punit->id, _("_Cancel"),
-                             NULL, 0, NULL);
+                             NULL, NULL, NULL);
     if (punit->activity == ACTIVITY_SENTRY
        || !can_unit_do_activity(punit, ACTIVITY_SENTRY)) {
       message_dialog_button_set_sensitive(wd, "button2", FALSE);
@@ -2688,7 +2687,7 @@
       popup_message_dialog(top_vbox,
                           _("Upgrade Unit!"), buf,
                           dummy_close_callback, NULL, 
-                          _("Darn"), NULL, 0, NULL);
+                          _("Darn"), NULL, NULL, NULL);
     } else {
       value = unit_upgrade_price(game.player_ptr, ut1, ut2);
 
@@ -2702,7 +2701,7 @@
                             dummy_close_callback, NULL,
                             _("_Yes"), unit_upgrade_callback_yes,
                             GINT_TO_POINTER(punit->id), _("_No"),
-                            NULL, 0, NULL);
+                            NULL, NULL, NULL);
       } else {
        my_snprintf(buf, sizeof(buf),
                    _("Upgrading %s to %s costs %d gold.\n"
@@ -2711,7 +2710,7 @@
                    game.player_ptr->economic.gold);
        popup_message_dialog(top_vbox,_("Upgrade Unit!"),buf,
                             dummy_close_callback, NULL, 
-                            _("Darn"), NULL, 0, NULL);
+                            _("Darn"), NULL, NULL, NULL);
       }
     }
   }
@@ -2896,7 +2895,7 @@
        popup_message_dialog(pdialog->shell, _("Buy It!"),buf,
                             buy_close_callback, pdialog,
                             _("_Yes"), buy_callback_yes, pdialog,
-                            _("_No"), NULL, pdialog, 0);
+                            _("_No"), NULL, pdialog, NULL, NULL);
   } else {
     my_snprintf(buf, sizeof(buf),
                _("%s costs %d gold.\nTreasury contains %d gold."),
@@ -2906,7 +2905,7 @@
                                              _("Buy It!"), buf,
                                              buy_close_callback, pdialog,
                                              _("Darn"), 
-                                             NULL, pdialog, 0);
+                                             NULL, pdialog, NULL, NULL);
   }
 }
 
@@ -3164,7 +3163,7 @@
                                             sell_close_callback, pdialog,
                                             _("_Yes"), sell_callback_yes,
                                             pdialog, _("_No"),
-                                            NULL, pdialog, 0);
+                                            NULL, pdialog, NULL, NULL);
 }
 
 /****************************************************************
Index: client/gui-gtk/dialogs.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk/dialogs.c,v
retrieving revision 1.103
diff -u -r1.103 dialogs.c
--- client/gui-gtk/dialogs.c    2002/06/24 15:56:39     1.103
+++ client/gui-gtk/dialogs.c    2002/12/13 02:49:05
@@ -393,14 +393,15 @@
     popup_message_dialog(top_vbox, _("Bribe Enemy Unit"), buf,
                         dummy_close_callback, NULL,
                         _("_Yes"), diplomat_bribe_yes_callback, 0, 
-                        _("_No"), NULL, 0, 0);
+                        _("_No"), NULL, NULL, NULL);
   } else {
     my_snprintf(buf, sizeof(buf),
                _("Bribing the unit costs %d gold.\n"
                  "Treasury contains %d gold."), 
                punit->bribe_cost, game.player_ptr->economic.gold);
     popup_message_dialog(top_vbox, _("Traitors Demand Too Much!"), buf,
-                        dummy_close_callback, NULL, _("Darn"), NULL, 0, 0);
+                        dummy_close_callback, NULL, _("Darn"), NULL,
+                        NULL, NULL);
   }
 }
 
@@ -951,7 +952,7 @@
                pcity->name);
     popup_message_dialog(top_vbox, _("City can't be incited!"), buf,
                         diplomat_incite_close_callback, NULL,
-                        _("Darn"), NULL, 0, 0);
+                        _("Darn"), NULL, NULL, NULL);
   } else if (game.player_ptr->economic.gold >= pcity->incite_revolt_cost) {
     my_snprintf(buf, sizeof(buf),
                _("Incite a revolt for %d gold?\nTreasury contains %d gold."), 
@@ -959,7 +960,7 @@
    popup_message_dialog(top_vbox, _("Incite a Revolt!"), buf,
                        diplomat_incite_close_callback, NULL,
                       _("_Yes"), diplomat_incite_yes_callback, 0,
-                      _("_No"), NULL, 0, 0);
+                      _("_No"), NULL, NULL, NULL);
   } else {
     my_snprintf(buf, sizeof(buf),
                _("Inciting a revolt costs %d gold.\n"
@@ -967,8 +968,7 @@
                pcity->incite_revolt_cost, game.player_ptr->economic.gold);
    popup_message_dialog(top_vbox, _("Traitors Demand Too Much!"), buf,
                        diplomat_incite_close_callback, NULL,
-                      _("Darn"), NULL, 0, 
-                      0);
+                      _("Darn"), NULL, NULL, NULL);
   }
 }
 
@@ -1035,8 +1035,7 @@
                             _("Steal _Technology"), diplomat_steal_callback, 0,
                             _("Incite a _Revolt"), diplomat_incite_callback, 0,
                             _("_Keep moving"), diplomat_keep_moving_callback, 
0,
-                            _("_Cancel"), NULL, 0,
-                            0);
+                            _("_Cancel"), NULL, NULL, NULL);
       
       if(!diplomat_can_do_action(punit, DIPLOMAT_EMBASSY, dest_x, dest_y))
        message_dialog_button_set_sensitive(shl,"button0",FALSE);
@@ -1061,8 +1060,7 @@
                              _("Steal _Technology"), spy_steal_popup, 0,
                              _("Incite a _Revolt"), diplomat_incite_callback, 
0,
                              _("_Keep moving"), diplomat_keep_moving_callback, 
0,
-                             _("_Cancel"), NULL, 0,
-                             0);
+                               _("_Cancel"), NULL, NULL, NULL);
  
       if(!diplomat_can_do_action(punit, DIPLOMAT_EMBASSY, dest_x, dest_y))
        message_dialog_button_set_sensitive(shl,"button0",FALSE);
@@ -1094,8 +1092,7 @@
                                diplomat_close_callback, NULL,
                              _("_Bribe Enemy Unit"), diplomat_bribe_callback, 
0,
                              _("_Sabotage Enemy Unit"), 
spy_sabotage_unit_callback, 0,
-                             _("_Cancel"), NULL, 0,
-                             0);
+                               _("_Cancel"), NULL, NULL, NULL);
         
        if(!diplomat_can_do_action(punit, DIPLOMAT_BRIBE, dest_x, dest_y))
         message_dialog_button_set_sensitive(shl,"button0",FALSE);
@@ -1167,8 +1164,7 @@
                                        caravan_close_callback, NULL,
                           _("Establish 
_Traderoute"),caravan_establish_trade_callback, 0,
                           _("Help build 
_Wonder"),caravan_help_build_wonder_callback, 0,
-                          _("_Keep moving"),NULL, 0,
-                          0);
+                                       _("_Keep moving"),NULL, NULL, NULL);
   
   if (!can_establish_trade_route(phomecity, pdestcity)) {
     message_dialog_button_set_sensitive(caravan_dialog, "button0", FALSE);
@@ -1259,8 +1255,7 @@
                       _("You say you wanna revolution?"),
                       dummy_close_callback, NULL, 
                       _("_Yes"),revolution_callback_yes, 0,
-                      _("_No"),NULL, 0, 
-                      0);
+                      _("_No"), NULL, NULL, NULL);
 }
 
 /****************************************************************
Index: client/gui-gtk/repodlgs.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk/repodlgs.c,v
retrieving revision 1.61
diff -u -r1.61 repodlgs.c
--- client/gui-gtk/repodlgs.c   2002/06/27 00:59:15     1.61
+++ client/gui-gtk/repodlgs.c   2002/12/13 02:49:05
@@ -908,7 +908,7 @@
                       _("Yes"),
                       upgrade_callback_yes,
                       GINT_TO_POINTER(activeunits_type[row]), _("No"),
-                      NULL, 0, 0);
+                      NULL, NULL, NULL);
 }
 
 /****************************************************************