From owner-svn-src-head@freebsd.org Tue Apr 19 20:47:15 2016 Return-Path: Delivered-To: svn-src-head@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 A7236B15915; Tue, 19 Apr 2016 20:47:15 +0000 (UTC) (envelope-from pfg@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 76EE2114C; Tue, 19 Apr 2016 20:47:15 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3JKlE6J043095; Tue, 19 Apr 2016 20:47:14 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3JKlEL1043093; Tue, 19 Apr 2016 20:47:14 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201604192047.u3JKlEL1043093@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Tue, 19 Apr 2016 20:47:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r298296 - head/sbin/restore 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.21 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Apr 2016 20:47:15 -0000 Author: pfg Date: Tue Apr 19 20:47:14 2016 New Revision: 298296 URL: https://svnweb.freebsd.org/changeset/base/298296 Log: restore: use our roundup2/rounddown2() macros when param.h is available. While here cleanup a little a malloc call. Modified: head/sbin/restore/dirs.c head/sbin/restore/symtab.c Modified: head/sbin/restore/dirs.c ============================================================================== --- head/sbin/restore/dirs.c Tue Apr 19 20:43:05 2016 (r298295) +++ head/sbin/restore/dirs.c Tue Apr 19 20:47:14 2016 (r298296) @@ -441,7 +441,7 @@ rst_seekdir(RST_DIR *dirp, long loc, lon loc -= base; if (loc < 0) fprintf(stderr, "bad seek pointer to rst_seekdir %ld\n", loc); - (void) lseek(dirp->dd_fd, base + (loc & ~(DIRBLKSIZ - 1)), SEEK_SET); + (void) lseek(dirp->dd_fd, base + rounddown2(loc, DIRBLKSIZ), SEEK_SET); dirp->dd_loc = loc & (DIRBLKSIZ - 1); if (dirp->dd_loc != 0) dirp->dd_size = read(dirp->dd_fd, dirp->dd_buf, DIRBLKSIZ); Modified: head/sbin/restore/symtab.c ============================================================================== --- head/sbin/restore/symtab.c Tue Apr 19 20:43:05 2016 (r298295) +++ head/sbin/restore/symtab.c Tue Apr 19 20:47:14 2016 (r298296) @@ -372,7 +372,7 @@ struct strhdr { }; #define STRTBLINCR (sizeof(struct strhdr)) -#define allocsize(size) (((size) + 1 + STRTBLINCR - 1) & ~(STRTBLINCR - 1)) +#define allocsize(size) roundup2((size) + 1, STRTBLINCR) static struct strhdr strtblhdr[allocsize(NAME_MAX) / STRTBLINCR]; @@ -384,7 +384,7 @@ char * savename(char *name) { struct strhdr *np; - long len; + size_t len; char *cp; if (name == NULL) @@ -395,7 +395,7 @@ savename(char *name) strtblhdr[len / STRTBLINCR].next = np->next; cp = (char *)np; } else { - cp = malloc((unsigned)allocsize(len)); + cp = malloc(allocsize(len)); if (cp == NULL) panic("no space for string table\n"); }