Browse Source

Change imsg header definitions to use standard types.

ok deraadt@ claudio@
OPENBSD_6_5
bcook 5 years ago
parent
commit
101f48a3de
3 changed files with 11 additions and 9 deletions
  1. +2
    -2
      src/lib/libutil/imsg-buffer.c
  2. +6
    -4
      src/lib/libutil/imsg.h
  3. +3
    -3
      src/lib/libutil/imsg_init.3

+ 2
- 2
src/lib/libutil/imsg-buffer.c View File

@ -1,4 +1,4 @@
/* $OpenBSD: imsg-buffer.c,v 1.11 2017/12/14 09:27:44 kettenis Exp $ */
/* $OpenBSD: imsg-buffer.c,v 1.12 2019/01/20 02:50:03 bcook Exp $ */
/* /*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@ -70,7 +70,7 @@ ibuf_dynamic(size_t len, size_t max)
static int static int
ibuf_realloc(struct ibuf *buf, size_t len) ibuf_realloc(struct ibuf *buf, size_t len)
{ {
u_char *b;
unsigned char *b;
/* on static buffers max is eq size and so the following fails */ /* on static buffers max is eq size and so the following fails */
if (buf->wpos + len > buf->max) { if (buf->wpos + len > buf->max) {


+ 6
- 4
src/lib/libutil/imsg.h View File

@ -1,4 +1,4 @@
/* $OpenBSD: imsg.h,v 1.4 2017/03/24 09:34:12 nicm Exp $ */
/* $OpenBSD: imsg.h,v 1.5 2019/01/20 02:50:03 bcook Exp $ */
/* /*
* Copyright (c) 2006, 2007 Pierre-Yves Ritschard <pyr@openbsd.org> * Copyright (c) 2006, 2007 Pierre-Yves Ritschard <pyr@openbsd.org>
@ -21,13 +21,15 @@
#ifndef _IMSG_H_ #ifndef _IMSG_H_
#define _IMSG_H_ #define _IMSG_H_
#include <stdint.h>
#define IBUF_READ_SIZE 65535 #define IBUF_READ_SIZE 65535
#define IMSG_HEADER_SIZE sizeof(struct imsg_hdr) #define IMSG_HEADER_SIZE sizeof(struct imsg_hdr)
#define MAX_IMSGSIZE 16384 #define MAX_IMSGSIZE 16384
struct ibuf { struct ibuf {
TAILQ_ENTRY(ibuf) entry; TAILQ_ENTRY(ibuf) entry;
u_char *buf;
unsigned char *buf;
size_t size; size_t size;
size_t max; size_t max;
size_t wpos; size_t wpos;
@ -42,8 +44,8 @@ struct msgbuf {
}; };
struct ibuf_read { struct ibuf_read {
u_char buf[IBUF_READ_SIZE];
u_char *rptr;
unsigned char buf[IBUF_READ_SIZE];
unsigned char *rptr;
size_t wpos; size_t wpos;
}; };


+ 3
- 3
src/lib/libutil/imsg_init.3 View File

@ -1,4 +1,4 @@
.\" $OpenBSD: imsg_init.3,v 1.22 2018/09/26 09:22:52 jmc Exp $
.\" $OpenBSD: imsg_init.3,v 1.23 2019/01/20 02:50:03 bcook Exp $
.\" .\"
.\" Copyright (c) 2010 Nicholas Marriott <nicm@openbsd.org> .\" Copyright (c) 2010 Nicholas Marriott <nicm@openbsd.org>
.\" .\"
@ -14,7 +14,7 @@
.\" IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING .\" IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\" .\"
.Dd $Mdocdate: September 26 2018 $
.Dd $Mdocdate: January 20 2019 $
.Dt IMSG_INIT 3 .Dt IMSG_INIT 3
.Os .Os
.Sh NAME .Sh NAME
@ -320,7 +320,7 @@ a queue of output buffers for transmission:
.Bd -literal -offset indent .Bd -literal -offset indent
struct ibuf { struct ibuf {
TAILQ_ENTRY(ibuf) entry; TAILQ_ENTRY(ibuf) entry;
u_char *buf;
unsigned char *buf;
size_t size; size_t size;
size_t max; size_t max;
size_t wpos; size_t wpos;


Loading…
Cancel
Save