From owner-svn-src-all@FreeBSD.ORG Sun Jan 1 23:41:32 2012 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 60C2C106567A; Sun, 1 Jan 2012 23:41:32 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4B0C28FC08; Sun, 1 Jan 2012 23:41:32 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q01NfWmD037505; Sun, 1 Jan 2012 23:41:32 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q01NfW7A037503; Sun, 1 Jan 2012 23:41:32 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201201012341.q01NfW7A037503@svn.freebsd.org> From: Dimitry Andric Date: Sun, 1 Jan 2012 23:41:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r229242 - stable/9/usr.sbin/sa 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, 01 Jan 2012 23:41:32 -0000 Author: dim Date: Sun Jan 1 23:41:31 2012 New Revision: 229242 URL: http://svn.freebsd.org/changeset/base/229242 Log: MFC r228681: In usr.sbin/sa/db.c, avoid warnings about assigning two const char arrays to non-const void pointers, by casting away const explicitly. Modified: stable/9/usr.sbin/sa/db.c Directory Properties: stable/9/usr.sbin/sa/ (props changed) Modified: stable/9/usr.sbin/sa/db.c ============================================================================== --- stable/9/usr.sbin/sa/db.c Sun Jan 1 23:39:56 2012 (r229241) +++ stable/9/usr.sbin/sa/db.c Sun Jan 1 23:41:31 2012 (r229242) @@ -79,7 +79,7 @@ db_copy_in(DB **mdb, const char *dbname, /* Obtain/set version. */ version = 1; - key.data = &VERSION_KEY; + key.data = (void*)&VERSION_KEY; key.size = sizeof(VERSION_KEY); rv = DB_GET(ddb, &key, &data, 0); @@ -175,7 +175,7 @@ db_copy_out(DB *mdb, const char *dbname, out: /* Add a version record. */ - key.data = &VERSION_KEY; + key.data = (void*)&VERSION_KEY; key.size = sizeof(VERSION_KEY); version = 2; data.data = &version;