From owner-svn-src-all@freebsd.org Sun Jun 5 14:04:56 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 32D0FB6A019; Sun, 5 Jun 2016 14:04:56 +0000 (UTC) (envelope-from ache@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 015771E63; Sun, 5 Jun 2016 14:04:55 +0000 (UTC) (envelope-from ache@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u55E4t3V017518; Sun, 5 Jun 2016 14:04:55 GMT (envelope-from ache@FreeBSD.org) Received: (from ache@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u55E4t74017517; Sun, 5 Jun 2016 14:04:55 GMT (envelope-from ache@FreeBSD.org) Message-Id: <201606051404.u55E4t74017517@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ache set sender to ache@FreeBSD.org using -f From: "Andrey A. Chernov" Date: Sun, 5 Jun 2016 14:04:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r301444 - stable/10/lib/libc/stdlib X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 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, 05 Jun 2016 14:04:56 -0000 Author: ache Date: Sun Jun 5 14:04:54 2016 New Revision: 301444 URL: https://svnweb.freebsd.org/changeset/base/301444 Log: Prepare for merge of r300956. One year old r288030 which fix prototypes can't be merged without conflicts and require merging of other versions too and I don't want to go deep in that unmerged commits chain. Modified: stable/10/lib/libc/stdlib/rand.c Modified: stable/10/lib/libc/stdlib/rand.c ============================================================================== --- stable/10/lib/libc/stdlib/rand.c Sun Jun 5 13:39:31 2016 (r301443) +++ stable/10/lib/libc/stdlib/rand.c Sun Jun 5 14:04:54 2016 (r301444) @@ -111,14 +111,13 @@ static u_long next = #endif int -rand() +rand(void) { return (do_rand(&next)); } void -srand(seed) -u_int seed; +srand(u_int seed) { next = seed; #ifndef USE_WEAK_SEEDING @@ -136,7 +135,7 @@ u_int seed; * data from the kernel. */ void -sranddev() +sranddev(void) { int mib[2]; size_t len;