PERFORCE change 97230 for review
John Birrell
jb at FreeBSD.org
Tue May 16 03:57:20 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=97230
Change 97230 by jb at 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);
More information about the p4-projects
mailing list