From owner-p4-projects@FreeBSD.ORG Wed Jun 9 02:29:48 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B2A36106567A; Wed, 9 Jun 2010 02:29:48 +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 76A301065670 for ; Wed, 9 Jun 2010 02:29:48 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from mail-iw0-f182.google.com (mail-iw0-f182.google.com [209.85.214.182]) by mx1.freebsd.org (Postfix) with ESMTP id 3B40E8FC14 for ; Wed, 9 Jun 2010 02:29:47 +0000 (UTC) Received: by iwn7 with SMTP id 7so1797061iwn.13 for ; Tue, 08 Jun 2010 19:29:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:sender:received :in-reply-to:references:date:x-google-sender-auth:message-id:subject :from:to:cc:content-type:content-transfer-encoding; bh=rXCAWUL+JRivaWaZQbCGqcNl4Mpy/MDRoGkMAL5f/Vs=; b=C9KG/KUU7v96O8VoMzPrHWnbxKcvTUvpIVbpaRZbG/3Lbb4CgVwzs13GnOLQjiDuZG kmjTx2GGbOKnlPMaj1ZnoBYpaUf/5agH54yncpPwqDQW4oHmnZVGs+qUmxcLiFg7Um0e fuCNc4lBaYvr8ApE5chV7SK1MDVjS4GuwHUjw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; b=JuSGGS1dXZR5E3lORt5GrBVafiXsUs9zQCl5612kRLuv7MIYISIzqrRYEzI2TQrhTd IZG9QybQcl36qQeB+WfP/jrmjE/n/JWb3c0yRO6syI18/vpCkT+4TkJ8TbHKRlrk8smD zFzFh9UCOUXMWp4crU8iR845DATg5p6+F5eYU= MIME-Version: 1.0 Received: by 10.231.59.1 with SMTP id j1mr2635074ibh.55.1276050587434; Tue, 08 Jun 2010 19:29:47 -0700 (PDT) Sender: yanegomi@gmail.com Received: by 10.231.69.19 with HTTP; Tue, 8 Jun 2010 19:29:47 -0700 (PDT) In-Reply-To: <201006090217.o592H6M7095917@repoman.freebsd.org> References: <201006090217.o592H6M7095917@repoman.freebsd.org> Date: Tue, 8 Jun 2010 19:29:47 -0700 X-Google-Sender-Auth: uZYgIjM0m3JAGiQs0fUQIyAq9DY Message-ID: From: Garrett Cooper To: Benjamin Fiedler Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: Perforce Change Reviews Subject: Re: PERFORCE change 179341 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: Wed, 09 Jun 2010 02:29:49 -0000 On Tue, Jun 8, 2010 at 7:17 PM, Benjamin Fiedler wro= te: > http://p4web.freebsd.org/@@179341?ac=3D10 > > Change 179341 by bfiedler@freebsd-7803 on 2010/06/09 02:17:04 > > =A0 =A0 =A0 =A0Added a few basic options (help, [no]ignore-file-name-case= ) and integer definitions. Changed makefile to use -g by default. ... > > +DEBUG =3D -g > =A0PROG=3D =A0diff > =A0SRCS=3D =A0diff.c diffdir.c diffreg.c > -CFLAGS+=3D =A0 =A0 =A0 -std=3Dc99 -Wall -pedantic > +CFLAGS+=3D =A0 =A0 =A0 -std=3Dc99 -Wall -pedantic $(DEBUG) That's what the DEBUG_FLAG var does? > =A0.include > > =3D=3D=3D=3D //depot/projects/soc2010/bsdtextproc/diff/diff.c#2 (text+ko)= =3D=3D=3D=3D > > @@ -44,7 +44,7 @@ > > =A0#include "diff.h" > > -int =A0 =A0 aflag, bflag, dflag, iflag, lflag, Nflag, Pflag, pflag, rfla= g; > +int =A0 =A0 aflag, Bflag, bflag, dflag, iflag, lflag, Nflag, Pflag, pfla= g, rflag; This could make merging patches entertaining if you add or remove a variable; it probably would be easier if each variable was per-line. This doesn't contradict style(9) though (and it says that that's ok as long as it doesn't overflow 80 columns). > =A0int =A0 =A0 sflag, tflag, Tflag, wflag; > =A0int =A0 =A0 format, context, status; ... > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 strcmp(dent1->d_name, dent2->d_name= ) ; This is kind of hard to read... can this be split up into if-based branch statements? > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0if (pos =3D=3D 0) { > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0/* file exists in both dir= s, diff it */ > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0diffit(dent1, path1, dirle= n1, path2, dirlen2); Thanks! -Garrett