svn commit: r229242 - stable/9/usr.sbin/sa

Dimitry Andric dim at FreeBSD.org
Sun Jan 1 23:41:32 UTC 2012


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;


More information about the svn-src-all mailing list