From owner-p4-projects@FreeBSD.ORG Tue May 16 03:57:20 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF68816A487; Tue, 16 May 2006 03:57:19 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C8FE016A480 for ; Tue, 16 May 2006 03:57:19 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7C38843D46 for ; Tue, 16 May 2006 03:57:19 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4G3v5Uu080290 for ; Tue, 16 May 2006 03:57:05 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4G3v54p080287 for perforce@freebsd.org; Tue, 16 May 2006 03:57:05 GMT (envelope-from jb@freebsd.org) Date: Tue, 16 May 2006 03:57:05 GMT Message-Id: <200605160357.k4G3v54p080287@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 97230 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, 16 May 2006 03:57:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=97230 Change 97230 by jb@jb_freebsd2 on 2006/05/16 03:56:44 Looks like I haven't figured out how p4 merges work. Sigh. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/ctf.c#5 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/ctf.c#5 (text) ==== @@ -457,15 +457,8 @@ } static ssize_t ->>>> ORIGINAL ctf.c#1 -compress_buffer(caddr_t buf, size_t n, resbuf_t *rb) -==== THEIRS ctf.c#2 -compress_buffer(const void *buf, size_t n, void *data) -==== YOURS ctf.c compress_buffer(void *buf, size_t n, void *arg) -<<<< { - resbuf_t *rb = (resbuf_t *)data; int rc; resbuf_t *rb = (resbuf_t *) arg; @@ -482,13 +475,7 @@ parseterminate("zlib deflate failed: %s", zError(rc)); } rb->rb_ptr = (caddr_t)rb->rb_zstr.next_out; ->>>> ORIGINAL ctf.c#1 -==== THEIRS ctf.c#2 - - return (n); -==== YOURS ctf.c return n; -<<<< } static void @@ -538,28 +525,12 @@ } static ssize_t ->>>> ORIGINAL ctf.c#1 -bcopy_data(void *buf, size_t n, caddr_t *posp) -==== THEIRS ctf.c#2 -bcopy_data(const void *buf, size_t n, void *data) -==== YOURS ctf.c bcopy_data(void *buf, size_t n, void *arg) -<<<< { ->>>> ORIGINAL ctf.c#1 -==== THEIRS ctf.c#2 - caddr_t *posp = (caddr_t *)data; -==== YOURS ctf.c caddr_t *posp = (caddr_t *) arg; -<<<< bcopy(buf, *posp, n); *posp += n; ->>>> ORIGINAL ctf.c#1 -==== THEIRS ctf.c#2 - return (n); -==== YOURS ctf.c return n; -<<<< } static caddr_t @@ -575,15 +546,8 @@ (void) bcopy_data(h, sizeof (ctf_header_t), &bufpos); (void) bcopy_data(buf->ctb_base, buf->ctb_ptr - buf->ctb_base, &bufpos); ->>>> ORIGINAL ctf.c#1 - if (strtab_write(&buf->ctb_strtab, (ssize_t (*)())bcopy_data, - &bufpos) < 0) -==== THEIRS ctf.c#2 - if (strtab_write(&buf->ctb_strtab, bcopy_data, &bufpos) < 0) -==== YOURS ctf.c if (strtab_write(&buf->ctb_strtab, bcopy_data, (void *) &bufpos) < 0) -<<<< terminate("strtab_write failed\n"); *resszp = bufpos - outbuf; return (outbuf); @@ -608,15 +572,8 @@ (void) compress_buffer(buf->ctb_base, buf->ctb_ptr - buf->ctb_base, &resbuf); compress_flush(&resbuf, Z_FULL_FLUSH); ->>>> ORIGINAL ctf.c#1 - if (strtab_write(&buf->ctb_strtab, (ssize_t (*)())compress_buffer, - &resbuf) < 0) -==== THEIRS ctf.c#2 - if (strtab_write(&buf->ctb_strtab, compress_buffer, &resbuf) < 0) -==== YOURS ctf.c if (strtab_write(&buf->ctb_strtab, compress_buffer, (void *) &resbuf) < 0) -<<<< terminate("strtab_write failed\n"); compress_end(&resbuf);