From owner-p4-projects@FreeBSD.ORG Tue Jun 24 16:16:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 87D2B1065674; Tue, 24 Jun 2008 16:16:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 46F0E1065672 for ; Tue, 24 Jun 2008 16:16:12 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3EF108FC16 for ; Tue, 24 Jun 2008 16:16:12 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5OGGC1I096089 for ; Tue, 24 Jun 2008 16:16:12 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5OGGCEr096087 for perforce@freebsd.org; Tue, 24 Jun 2008 16:16:12 GMT (envelope-from gabor@freebsd.org) Date: Tue, 24 Jun 2008 16:16:12 GMT Message-Id: <200806241616.m5OGGCEr096087@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 144026 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Jun 2008 16:16:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=144026 Change 144026 by gabor@gabor_server on 2008/06/24 16:15:17 - Cleanup: use grep_malloc instead of malloc Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/binary.c#10 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#42 edit .. //depot/projects/soc2008/gabor_textproc/grep/util.c#37 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/binary.c#10 (text+ko) ==== @@ -77,8 +77,7 @@ if ((s = mbstowcs(NULL, f->base, 0)) == -1) return (0); - if ((wbuf = malloc((s + 1) * sizeof(wchar_t))) == NULL) - err(2, NULL); + wbuf = grep_malloc((s + 1) * sizeof(wchar_t)); mbstowcs(wbuf, f->base, s); ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#42 (text+ko) ==== @@ -649,8 +649,7 @@ else for (c = 0; argc--; ++argv) { if (devbehave == DEV_SKIP) { - if (!(finfo = malloc(sizeof(struct stat)))) - err(2, NULL); + finfo = grep_malloc(sizeof(struct stat)); if (stat(*argv, finfo) == -1) err(2, NULL); if (S_ISBLK(finfo->st_mode) || ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#37 (text+ko) ==== @@ -93,8 +93,7 @@ if ((devbehave == DEV_SKIP) || (dirbehave == DIR_RECURSE) || (dirbehave == DIR_SKIP)) { struct stat *finfo; - if (!(finfo = malloc(sizeof(struct stat)))) - err(2, NULL); + finfo = grep_malloc(sizeof(struct stat)); if (stat(p->fts_path, finfo) == -1) err(2, NULL); @@ -233,12 +232,9 @@ if ((r == 0) && (color != NULL) && !oflag && !nottext) { char *tmp, *begin, *matched, *end; - if ((begin = malloc(strlen(l->dat) - pmatch.rm_so + 1)) == NULL) - errx(2, NULL); - if ((matched = malloc((pmatch.rm_eo - pmatch.rm_so + 1) * sizeof(char))) == NULL) - errx(2, NULL); - if ((end = malloc(strlen(l->dat) - pmatch.rm_eo + 1)) == NULL) - errx(2, NULL); + begin = grep_malloc(strlen(l->dat) - pmatch.rm_so + 1); + matched = grep_malloc((pmatch.rm_eo - pmatch.rm_so + 1) * sizeof(char)); + end = grep_malloc(strlen(l->dat) - pmatch.rm_eo + 1); strlcpy(begin, l->dat, pmatch.rm_so + 1); strlcpy(matched, &(l->dat[pmatch.rm_so]), pmatch.rm_eo - pmatch.rm_so + 1); @@ -256,8 +252,7 @@ if (r == 0 && oflag && !nottext) { char *tmp, *matched; - if ((matched = malloc((pmatch.rm_eo - pmatch.rm_so + 2) * sizeof(char))) == NULL) - errx(2, NULL); + matched = grep_malloc((pmatch.rm_eo - pmatch.rm_so + 2) * sizeof(char)); strlcpy(matched, &(l->dat[pmatch.rm_so]), pmatch.rm_eo - pmatch.rm_so + 1); if (color != NULL)