From owner-svn-src-head@FreeBSD.ORG  Thu Nov 14 18:41:58 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E0041D3D;
 Thu, 14 Nov 2013 18:41:58 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id CF64F2438;
 Thu, 14 Nov 2013 18:41:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAEIfw30040621;
 Thu, 14 Nov 2013 18:41:58 GMT (envelope-from sbruno@svn.freebsd.org)
Received: (from sbruno@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAEIfwFU040620;
 Thu, 14 Nov 2013 18:41:58 GMT (envelope-from sbruno@svn.freebsd.org)
Message-Id: <201311141841.rAEIfwFU040620@svn.freebsd.org>
From: Sean Bruno <sbruno@FreeBSD.org>
Date: Thu, 14 Nov 2013 18:41:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r258139 - head/contrib/gperf/src
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.16
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 14 Nov 2013 18:41:59 -0000

Author: sbruno
Date: Thu Nov 14 18:41:58 2013
New Revision: 258139
URL: http://svnweb.freebsd.org/changeset/base/258139

Log:
  Repair build after svn r258115
  
  options.get_size_type() appears to return a const char *, so assume that
  its a string as oppose to *nothing*.  I have no idea what apple's code is
  trying to do here:
  
  http://opensource.apple.com/source/gperf/gperf-9/patches/size_type.patch

Modified:
  head/contrib/gperf/src/output.cc

Modified: head/contrib/gperf/src/output.cc
==============================================================================
--- head/contrib/gperf/src/output.cc	Thu Nov 14 16:10:21 2013	(r258138)
+++ head/contrib/gperf/src/output.cc	Thu Nov 14 18:41:58 2013	(r258139)
@@ -779,7 +779,7 @@ Output::output_hash_function () const
             "     register %s len;\n" :
           option[ANSIC] | option[CPLUSPLUS] ?
                  "(register const char *str, register %s len)\n" :
-          "", option.get_size_type());
+          "%s", option.get_size_type());
 
   /* Note that when the hash function is called, it has already been verified
      that  min_key_len <= len <= max_key_len.  */
@@ -1907,7 +1907,7 @@ Output::output_lookup_function () const
             "     register %s len;\n" :
           option[ANSIC] | option[CPLUSPLUS] ?
                  "(register const char *str, register %s len)\n" :
-          "", option.get_size_type());
+          "%s", option.get_size_type());
 
   /* Output the function's body.  */
   printf ("{\n");