Update of /cvsroot/tmux/tmux/compat
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv3853
Modified Files:
imsg-buffer.c imsg.c imsg.h
Log Message:
Sync OpenBSD patchset 706:
Rename some imsg bits to make namespace collisions less likely buf to
ibuf, buf_read to ibuf_read, READ_BUF_SIZE to IBUF_READ_SIZE.
Index: imsg.h
===================================================================
RCS file: /cvsroot/tmux/tmux/compat/imsg.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- imsg.h 15 Sep 2009 23:59:40 -0000 1.4
+++ imsg.h 6 Jun 2010 00:08:28 -0000 1.5
@@ -1,5 +1,5 @@
/* $Id$ */
-/* $OpenBSD: imsg.h,v 1.2 2009/09/15 18:12:51 jacekm Exp $ */
+/* $OpenBSD: imsg.h,v 1.4 2010/05/26 13:56:07 nicm Exp $ */
/*
* Copyright (c) 2006, 2007 Pierre-Yves Ritschard <[email protected]>
@@ -21,12 +21,12 @@
#include "tmux.h"
-#define READ_BUF_SIZE 65535
+#define IBUF_READ_SIZE 65535
#define IMSG_HEADER_SIZE sizeof(struct imsg_hdr)
#define MAX_IMSGSIZE 16384
-struct buf {
- TAILQ_ENTRY(buf) entry;
+struct ibuf {
+ TAILQ_ENTRY(ibuf) entry;
u_char *buf;
size_t size;
size_t max;
@@ -36,13 +36,13 @@
};
struct msgbuf {
- TAILQ_HEAD(, buf) bufs;
+ TAILQ_HEAD(, ibuf) bufs;
u_int32_t queued;
int fd;
};
-struct buf_read {
- u_char buf[READ_BUF_SIZE];
+struct ibuf_read {
+ u_char buf[IBUF_READ_SIZE];
u_char *rptr;
size_t wpos;
};
@@ -54,7 +54,7 @@
struct imsgbuf {
TAILQ_HEAD(, imsg_fd) fds;
- struct buf_read r;
+ struct ibuf_read r;
struct msgbuf w;
int fd;
pid_t pid;
@@ -78,16 +78,16 @@
/* buffer.c */
-struct buf *buf_open(size_t);
-struct buf *buf_dynamic(size_t, size_t);
-int buf_add(struct buf *, const void *, size_t);
-void *buf_reserve(struct buf *, size_t);
-void *buf_seek(struct buf *, size_t, size_t);
-size_t buf_size(struct buf *);
-size_t buf_left(struct buf *);
-void buf_close(struct msgbuf *, struct buf *);
-int buf_write(struct msgbuf *);
-void buf_free(struct buf *);
+struct ibuf *ibuf_open(size_t);
+struct ibuf *ibuf_dynamic(size_t, size_t);
+int ibuf_add(struct ibuf *, const void *, size_t);
+void *ibuf_reserve(struct ibuf *, size_t);
+void *ibuf_seek(struct ibuf *, size_t, size_t);
+size_t ibuf_size(struct ibuf *);
+size_t ibuf_left(struct ibuf *);
+void ibuf_close(struct msgbuf *, struct ibuf *);
+int ibuf_write(struct msgbuf *);
+void ibuf_free(struct ibuf *);
void msgbuf_init(struct msgbuf *);
void msgbuf_clear(struct msgbuf *);
int msgbuf_write(struct msgbuf *);
@@ -101,10 +101,10 @@
int, void *, u_int16_t);
int imsg_composev(struct imsgbuf *, u_int32_t, u_int32_t, pid_t,
int, const struct iovec *, int);
-struct buf *imsg_create(struct imsgbuf *, u_int32_t, u_int32_t, pid_t,
+struct ibuf *imsg_create(struct imsgbuf *, u_int32_t, u_int32_t, pid_t,
u_int16_t);
-int imsg_add(struct buf *, void *, u_int16_t);
-void imsg_close(struct imsgbuf *, struct buf *);
+int imsg_add(struct ibuf *, void *, u_int16_t);
+void imsg_close(struct imsgbuf *, struct ibuf *);
void imsg_free(struct imsg *);
int imsg_flush(struct imsgbuf *);
void imsg_clear(struct imsgbuf *);
Index: imsg-buffer.c
===================================================================
RCS file: /cvsroot/tmux/tmux/compat/imsg-buffer.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- imsg-buffer.c 15 Sep 2009 23:59:40 -0000 1.4
+++ imsg-buffer.c 6 Jun 2010 00:08:28 -0000 1.5
@@ -1,5 +1,5 @@
/* $Id$ */
-/* $OpenBSD: imsg-buffer.c,v 1.2 2009/09/15 18:12:51 jacekm Exp $ */
+/* $OpenBSD: imsg-buffer.c,v 1.3 2010/05/26 13:56:07 nicm Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <[email protected]>
@@ -28,16 +28,16 @@
#include "tmux.h"
-int buf_realloc(struct buf *, size_t);
-void buf_enqueue(struct msgbuf *, struct buf *);
-void buf_dequeue(struct msgbuf *, struct buf *);
+int ibuf_realloc(struct ibuf *, size_t);
+void ibuf_enqueue(struct msgbuf *, struct ibuf *);
+void ibuf_dequeue(struct msgbuf *, struct ibuf *);
-struct buf *
-buf_open(size_t len)
+struct ibuf *
+ibuf_open(size_t len)
{
- struct buf *buf;
+ struct ibuf *buf;
- if ((buf = calloc(1, sizeof(struct buf))) == NULL)
+ if ((buf = calloc(1, sizeof(struct ibuf))) == NULL)
return (NULL);
if ((buf->buf = malloc(len)) == NULL) {
free(buf);
@@ -49,15 +49,15 @@
return (buf);
}
-struct buf *
-buf_dynamic(size_t len, size_t max)
+struct ibuf *
+ibuf_dynamic(size_t len, size_t max)
{
- struct buf *buf;
+ struct ibuf *buf;
if (max < len)
return (NULL);
- if ((buf = buf_open(len)) == NULL)
+ if ((buf = ibuf_open(len)) == NULL)
return (NULL);
if (max > 0)
@@ -67,7 +67,7 @@
}
int
-buf_realloc(struct buf *buf, size_t len)
+ibuf_realloc(struct ibuf *buf, size_t len)
{
u_char *b;
@@ -87,10 +87,10 @@
}
int
-buf_add(struct buf *buf, const void *data, size_t len)
+ibuf_add(struct ibuf *buf, const void *data, size_t len)
{
if (buf->wpos + len > buf->size)
- if (buf_realloc(buf, len) == -1)
+ if (ibuf_realloc(buf, len) == -1)
return (-1);
memcpy(buf->buf + buf->wpos, data, len);
@@ -99,12 +99,12 @@
}
void *
-buf_reserve(struct buf *buf, size_t len)
+ibuf_reserve(struct ibuf *buf, size_t len)
{
void *b;
if (buf->wpos + len > buf->size)
- if (buf_realloc(buf, len) == -1)
+ if (ibuf_realloc(buf, len) == -1)
return (NULL);
b = buf->buf + buf->wpos;
@@ -113,7 +113,7 @@
}
void *
-buf_seek(struct buf *buf, size_t pos, size_t len)
+ibuf_seek(struct ibuf *buf, size_t pos, size_t len)
{
/* only allowed to seek in already written parts */
if (pos + len > buf->wpos)
@@ -123,28 +123,28 @@
}
size_t
-buf_size(struct buf *buf)
+ibuf_size(struct ibuf *buf)
{
return (buf->wpos);
}
size_t
-buf_left(struct buf *buf)
+ibuf_left(struct ibuf *buf)
{
return (buf->max - buf->wpos);
}
void
-buf_close(struct msgbuf *msgbuf, struct buf *buf)
+ibuf_close(struct msgbuf *msgbuf, struct ibuf *buf)
{
- buf_enqueue(msgbuf, buf);
+ ibuf_enqueue(msgbuf, buf);
}
int
-buf_write(struct msgbuf *msgbuf)
+ibuf_write(struct msgbuf *msgbuf)
{
struct iovec iov[IOV_MAX];
- struct buf *buf;
+ struct ibuf *buf;
unsigned int i = 0;
ssize_t n;
@@ -176,7 +176,7 @@
}
void
-buf_free(struct buf *buf)
+ibuf_free(struct ibuf *buf)
{
free(buf->buf);
free(buf);
@@ -193,14 +193,14 @@
void
msgbuf_drain(struct msgbuf *msgbuf, size_t n)
{
- struct buf *buf, *next;
+ struct ibuf *buf, *next;
for (buf = TAILQ_FIRST(&msgbuf->bufs); buf != NULL && n > 0;
buf = next) {
next = TAILQ_NEXT(buf, entry);
if (buf->rpos + n >= buf->wpos) {
n -= buf->wpos - buf->rpos;
- buf_dequeue(msgbuf, buf);
+ ibuf_dequeue(msgbuf, buf);
} else {
buf->rpos += n;
n = 0;
@@ -211,17 +211,17 @@
void
msgbuf_clear(struct msgbuf *msgbuf)
{
- struct buf *buf;
+ struct ibuf *buf;
while ((buf = TAILQ_FIRST(&msgbuf->bufs)) != NULL)
- buf_dequeue(msgbuf, buf);
+ ibuf_dequeue(msgbuf, buf);
}
int
msgbuf_write(struct msgbuf *msgbuf)
{
struct iovec iov[IOV_MAX];
- struct buf *buf;
+ struct ibuf *buf;
unsigned int i = 0;
ssize_t n;
struct msghdr msg;
@@ -284,14 +284,14 @@
}
void
-buf_enqueue(struct msgbuf *msgbuf, struct buf *buf)
+ibuf_enqueue(struct msgbuf *msgbuf, struct ibuf *buf)
{
TAILQ_INSERT_TAIL(&msgbuf->bufs, buf, entry);
msgbuf->queued++;
}
void
-buf_dequeue(struct msgbuf *msgbuf, struct buf *buf)
+ibuf_dequeue(struct msgbuf *msgbuf, struct ibuf *buf)
{
TAILQ_REMOVE(&msgbuf->bufs, buf, entry);
@@ -299,5 +299,5 @@
close(buf->fd);
msgbuf->queued--;
- buf_free(buf);
+ ibuf_free(buf);
}
Index: imsg.c
===================================================================
RCS file: /cvsroot/tmux/tmux/compat/imsg.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- imsg.c 12 Apr 2010 21:45:18 -0000 1.4
+++ imsg.c 6 Jun 2010 00:08:28 -0000 1.5
@@ -1,5 +1,5 @@
/* $Id$ */
-/* $OpenBSD: imsg.c,v 1.2 2010/04/07 18:09:39 nicm Exp $ */
+/* $OpenBSD: imsg.c,v 1.3 2010/05/26 13:56:07 nicm Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <[email protected]>
@@ -135,7 +135,7 @@
imsg_compose(struct imsgbuf *ibuf, u_int32_t type, u_int32_t peerid,
pid_t pid, int fd, void *data, u_int16_t datalen)
{
- struct buf *wbuf;
+ struct ibuf *wbuf;
if ((wbuf = imsg_create(ibuf, type, peerid, pid, datalen)) == NULL)
return (-1);
@@ -154,7 +154,7 @@
imsg_composev(struct imsgbuf *ibuf, u_int32_t type, u_int32_t peerid,
pid_t pid, int fd, const struct iovec *iov, int iovcnt)
{
- struct buf *wbuf;
+ struct ibuf *wbuf;
int i, datalen = 0;
for (i = 0; i < iovcnt; i++)
@@ -175,11 +175,11 @@
}
/* ARGSUSED */
-struct buf *
+struct ibuf *
imsg_create(struct imsgbuf *ibuf, u_int32_t type, u_int32_t peerid,
pid_t pid, u_int16_t datalen)
{
- struct buf *wbuf;
+ struct ibuf *wbuf;
struct imsg_hdr hdr;
datalen += IMSG_HEADER_SIZE;
@@ -193,7 +193,7 @@
hdr.peerid = peerid;
if ((hdr.pid = pid) == 0)
hdr.pid = ibuf->pid;
- if ((wbuf = buf_dynamic(datalen, MAX_IMSGSIZE)) == NULL) {
+ if ((wbuf = ibuf_dynamic(datalen, MAX_IMSGSIZE)) == NULL) {
return (NULL);
}
if (imsg_add(wbuf, &hdr, sizeof(hdr)) == -1)
@@ -203,18 +203,18 @@
}
int
-imsg_add(struct buf *msg, void *data, u_int16_t datalen)
+imsg_add(struct ibuf *msg, void *data, u_int16_t datalen)
{
if (datalen)
- if (buf_add(msg, data, datalen) == -1) {
- buf_free(msg);
+ if (ibuf_add(msg, data, datalen) == -1) {
+ ibuf_free(msg);
return (-1);
}
return (datalen);
}
void
-imsg_close(struct imsgbuf *ibuf, struct buf *msg)
+imsg_close(struct imsgbuf *ibuf, struct ibuf *msg)
{
struct imsg_hdr *hdr;
@@ -226,7 +226,7 @@
hdr->len = (u_int16_t)msg->wpos;
- buf_close(&ibuf->w, msg);
+ ibuf_close(&ibuf->w, msg);
}
void
------------------------------------------------------------------------------
ThinkGeek and WIRED's GeekDad team up for the Ultimate
GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the
lucky parental unit. See the prize list and enter to win:
http://p.sf.net/sfu/thinkgeek-promo
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
