From owner-svn-src-all@FreeBSD.ORG Sun Jun 20 04:14:50 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9A6541065670; Sun, 20 Jun 2010 04:14:50 +0000 (UTC) (envelope-from randi@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7EFFE8FC13; Sun, 20 Jun 2010 04:14:50 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o5K4EoS0089981; Sun, 20 Jun 2010 04:14:50 GMT (envelope-from randi@svn.freebsd.org) Received: (from randi@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5K4Eoqn089976; Sun, 20 Jun 2010 04:14:50 GMT (envelope-from randi@svn.freebsd.org) Message-Id: <201006200414.o5K4Eoqn089976@svn.freebsd.org> From: Randi Harper Date: Sun, 20 Jun 2010 04:14:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r209359 - head/usr.sbin/sysinstall X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Jun 2010 04:14:50 -0000 Author: randi Date: Sun Jun 20 04:14:49 2010 New Revision: 209359 URL: http://svn.freebsd.org/changeset/base/209359 Log: Clean up item_add and remove -fno-strict-aliasing from CFLAGS. Note that the "aux" value in libdialog is really an opaque pointer, but libdialog stores it as a long for historical reasons. Approved by: cperciva (mentor) Modified: head/usr.sbin/sysinstall/Makefile head/usr.sbin/sysinstall/index.c head/usr.sbin/sysinstall/misc.c head/usr.sbin/sysinstall/sysinstall.h Modified: head/usr.sbin/sysinstall/Makefile ============================================================================== --- head/usr.sbin/sysinstall/Makefile Sun Jun 20 00:34:06 2010 (r209358) +++ head/usr.sbin/sysinstall/Makefile Sun Jun 20 04:14:49 2010 (r209359) @@ -14,7 +14,7 @@ SRCS= anonFTP.c cdrom.c command.c config system.c tcpip.c termcap.c ttys.c ufs.c usb.c user.c \ variable.c ${_wizard} keymap.h countries.h -CFLAGS+= -DUSE_GZIP=1 -fno-strict-aliasing +CFLAGS+= -DUSE_GZIP=1 .if ${MACHINE} == "pc98" CFLAGS+= -DPC98 .endif Modified: head/usr.sbin/sysinstall/index.c ============================================================================== --- head/usr.sbin/sysinstall/index.c Sun Jun 20 00:34:06 2010 (r209358) +++ head/usr.sbin/sysinstall/index.c Sun Jun 20 04:14:49 2010 (r209359) @@ -650,8 +650,8 @@ index_menu(PkgNodePtr root, PkgNodePtr t SAFE_STRCPY(buf, kp->desc); if (strlen(buf) > (_MAX_DESC - maxname)) buf[_MAX_DESC - maxname] = '\0'; - nitems = item_add(nitems, kp->name, (char *)buf, pkg_checked, - pkg_fire, pkg_selected, kp, (int *)(&lists), + nitems = item_add(nitems, kp->name, buf, pkg_checked, + pkg_fire, pkg_selected, kp, &lists, &curr, &max); ++n; kp = kp->next; Modified: head/usr.sbin/sysinstall/misc.c ============================================================================== --- head/usr.sbin/sysinstall/misc.c Sun Jun 20 00:34:06 2010 (r209358) +++ head/usr.sbin/sysinstall/misc.c Sun Jun 20 04:14:49 2010 (r209359) @@ -238,7 +238,7 @@ item_add(dialogMenuItem *list, char *pro int (*checked)(dialogMenuItem *self), int (*fire)(dialogMenuItem *self), void (*selected)(dialogMenuItem *self, int is_selected), - void *data, int *aux, int *curr, int *max) + void *data, void *aux, int *curr, int *max) { dialogMenuItem *d; Modified: head/usr.sbin/sysinstall/sysinstall.h ============================================================================== --- head/usr.sbin/sysinstall/sysinstall.h Sun Jun 20 00:34:06 2010 (r209358) +++ head/usr.sbin/sysinstall/sysinstall.h Sun Jun 20 04:14:49 2010 (r209359) @@ -755,7 +755,7 @@ extern dialogMenuItem *item_add(dialogMe int (*checked)(dialogMenuItem *self), int (*fire)(dialogMenuItem *self), void (*selected)(dialogMenuItem *self, int is_selected), - void *data, int *aux, int *curr, int *max); + void *data, void *aux, int *curr, int *max); extern void items_free(dialogMenuItem *list, int *curr, int *max); extern int Mkdir(char *); extern int Mkdir_command(char *key, void *data);