From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Sep 6 22:37:54 2010 Return-Path: Delivered-To: freebsd-ports-bugs@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 749B610656B6 for ; Mon, 6 Sep 2010 22:37:54 +0000 (UTC) (envelope-from Pascal.Stumpf@cubes.de) Received: from smtprelay03.ispgateway.de (smtprelay03.ispgateway.de [80.67.31.26]) by mx1.freebsd.org (Postfix) with ESMTP id 0BED48FC16 for ; Mon, 6 Sep 2010 22:37:53 +0000 (UTC) Received: from [62.224.217.171] (helo=ikarus.local.cubes.de) by smtprelay03.ispgateway.de with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.68) (envelope-from ) id 1OskK0-0006fs-Ck for freebsd-ports-bugs@freebsd.org; Tue, 07 Sep 2010 00:37:52 +0200 From: Pascal Stumpf To: freebsd-ports-bugs@freebsd.org Date: Tue, 7 Sep 2010 00:37:51 +0200 User-Agent: KMail/1.13.5 (FreeBSD/8.1-PRERELEASE; KDE/4.5.1; amd64; ; ) References: <201009051606.31673.Pascal.Stumpf@cubes.de> <20100906070318.GA11528@lonesome.com> In-Reply-To: <20100906070318.GA11528@lonesome.com> MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <201009070037.52223.Pascal.Stumpf@cubes.de> X-Df-Sender: 429867 Subject: [PATCH No. 2] ports/150287: Segfault: games/spider crashes after 51 moves X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Sep 2010 22:37:54 -0000 Ok; while we=E2=80=99re here, we can do some more cleanup. :-) =2D-- spider.c.orig 2010-09-07 00:00:48.000000000 +0200 +++ spider.c 2010-09-07 00:22:34.000000000 +0200 @@ -17,6 +17,7 @@ #include "defs.h" #include "globals.h" #include +#include =20 static void fix_coords(); =20 @@ -619,7 +620,7 @@ =20 return (type_names[type]); } =2D#endif DEBUG +#endif /* DEBUG */ =20 =20 /* =2D-- movelog.c.orig 1991-09-28 19:46:17.000000000 +0200 +++ movelog.c 2010-09-07 00:00:30.000000000 +0200 @@ -16,6 +16,7 @@ =20 #include "defs.h" #include "globals.h" +#include #include #include #include @@ -33,6 +34,9 @@ =20 extern int cheat_count; =20 +static int card_to_int(CardPtr card); +static int restore_game(char *str, char *str2); + make_deck_cache() { CardPtr tmp; =2D-- gfx.c.orig 2010-09-07 00:01:08.000000000 +0200 +++ gfx.c 2010-09-07 00:21:23.000000000 +0200 @@ -15,6 +15,7 @@ */ #include "defs.h" #include "globals.h" +#include =20 #ifdef ROUND_CARDS #include @@ -166,7 +167,7 @@ gcflags |=3D GCFont; =20 textgc =3D XCreateGC(dpy, RootWindow(dpy, screen), gcflags, &gcv); =2D#endif KITLESS +#endif /* KITLESS */ =20 tmpmap =3D XCreateBitmapFromData(dpy, RootWindow(dpy, screen), logo_bits, logo_width, logo_height); @@ -1321,7 +1322,7 @@ XDrawImageString(dpy, message_win, textgc, MESSAGE_X, message_y, last_message, strlen(last_message)); } =2D#endif KITLESS +#endif /* KITLESS */ =20 void card_message(str, card) =2D-- util.c.orig 2010-09-07 00:01:46.000000000 +0200 +++ util.c 2010-09-07 00:02:35.000000000 +0200 @@ -23,6 +23,7 @@ #include "xaw_ui.h" #endif /* XAW */ #include +#include #include #include =20 =2D-- xv_stubs.c.orig 2010-09-07 00:01:59.000000000 +0200 +++ xv_stubs.c 2010-09-07 00:03:01.000000000 +0200 @@ -10,6 +10,7 @@ * @(#)xv_stubs.c 2.2 90/04/27 */ #include +#include #include #include #include =2D-- xv_ui.c.orig 2010-09-07 00:02:12.000000000 +0200 +++ xv_ui.c 2010-09-07 00:03:29.000000000 +0200 @@ -16,6 +16,7 @@ */ =20 #include +#include #include #include #include =2D-- defs.h.orig 2010-09-07 00:19:00.000000000 +0200 +++ defs.h 2010-09-07 00:20:09.000000000 +0200 @@ -31,7 +31,7 @@ =20 typedef enum {Faceup, Facedown, Joker} Type; =20 =2D#else DEBUG +#else /* DEBUG */ =20 typedef char Suit; typedef char Rank; @@ -60,7 +60,7 @@ #define Facedown 1 #define Joker 2 =20 =2D#endif DEBUG +#endif /* DEBUG */ =20 #define NUM_DECKS 2 #define NUM_PILES 8 =2D-- globals.h.orig 2010-09-07 00:21:42.000000000 +0200 +++ globals.h 2010-09-07 00:22:04.000000000 +0200 @@ -90,7 +90,7 @@ void button_press(); void button_release(); void do_expand(); =2D#endif KITLESS +#endif /* KITLESS */ =20 #ifdef XAW Bool can_get_help_files(); =2D-- windows.c.orig 2010-09-07 00:23:35.000000000 +0200 +++ windows.c 2010-09-07 00:24:05.000000000 +0200 @@ -116,7 +116,7 @@ XMapWindow(dpy, message_win); XMapWindow(dpy, table); } =2D#endif KITLESS +#endif /* KITLESS */ =20 #ifndef KITLESS table_init(win) @@ -140,4 +140,4 @@ } XChangeWindowAttributes(dpy, table, winmask, &winattr); } =2D#endif KITLESS +#endif /* KITLESS */ =2D-- events.c.orig 2010-09-07 00:24:57.000000000 +0200 +++ events.c 2010-09-07 00:26:21.000000000 +0200 @@ -16,6 +16,7 @@ =20 #include "defs.h" #include "globals.h" +#include =20 extern int cheat_count; =20 =2D-- xaw_ui.c.orig 2010-09-07 00:27:06.000000000 +0200 +++ xaw_ui.c 2010-09-07 00:27:28.000000000 +0200 @@ -19,6 +19,7 @@ #include "xaw_ui.h" =20 #include "spider.bm" +#include =20 static XtAppContext spider_con; Widget toplevel;