Module Name: src
Committed By: dholland
Date: Fri Jan 22 23:11:50 UTC 2016
Modified Files:
src/include/protocols: dumprestore.h routed.h rwhod.h talkd.h timed.h
Log Message:
These all need stdint.h.
Also, dumprestore.h needs ufs/ufs/dinode.h; in talkd.h use unsigned
char instead of u_char; and in timed.h include limits.h and use
_POSIX_HOST_NAME_MAX instead of MAXHOSTNAMELEN as the latter would
require sys/param.h.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/include/protocols/dumprestore.h
cvs rdiff -u -r1.14 -r1.15 src/include/protocols/routed.h
cvs rdiff -u -r1.7 -r1.8 src/include/protocols/rwhod.h
cvs rdiff -u -r1.10 -r1.11 src/include/protocols/talkd.h
cvs rdiff -u -r1.11 -r1.12 src/include/protocols/timed.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/include/protocols/dumprestore.h
diff -u src/include/protocols/dumprestore.h:1.17 src/include/protocols/dumprestore.h:1.18
--- src/include/protocols/dumprestore.h:1.17 Mon Nov 16 17:09:56 2015
+++ src/include/protocols/dumprestore.h Fri Jan 22 23:11:50 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: dumprestore.h,v 1.17 2015/11/16 17:09:56 christos Exp $ */
+/* $NetBSD: dumprestore.h,v 1.18 2016/01/22 23:11:50 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -39,6 +39,9 @@
#ifndef _PROTOCOLS_DUMPRESTORE_H_
#define _PROTOCOLS_DUMPRESTORE_H_
+#include <stdint.h>
+#include <ufs/ufs/dinode.h>
+
/*
* TP_BSIZE is the size of file blocks on the dump tapes.
* Note that TP_BSIZE must be a multiple of DEV_BSIZE.
Index: src/include/protocols/routed.h
diff -u src/include/protocols/routed.h:1.14 src/include/protocols/routed.h:1.15
--- src/include/protocols/routed.h:1.14 Mon Dec 26 19:01:47 2005
+++ src/include/protocols/routed.h Fri Jan 22 23:11:50 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: routed.h,v 1.14 2005/12/26 19:01:47 perry Exp $ */
+/* $NetBSD: routed.h,v 1.15 2016/01/22 23:11:50 dholland Exp $ */
/*-
* Copyright (c) 1983, 1989, 1993
@@ -33,6 +33,9 @@
#ifndef _PROTOCOLS_ROUTED_H_
#define _PROTOCOLS_ROUTED_H_
+
+#include <stdint.h>
+
#ifdef __cplusplus
extern "C" {
#endif
Index: src/include/protocols/rwhod.h
diff -u src/include/protocols/rwhod.h:1.7 src/include/protocols/rwhod.h:1.8
--- src/include/protocols/rwhod.h:1.7 Thu Aug 7 09:44:13 2003
+++ src/include/protocols/rwhod.h Fri Jan 22 23:11:50 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: rwhod.h,v 1.7 2003/08/07 09:44:13 agc Exp $ */
+/* $NetBSD: rwhod.h,v 1.8 2016/01/22 23:11:50 dholland Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -34,6 +34,8 @@
#ifndef _PROTOCOLS_RWHOD_H_
#define _PROTOCOLS_RWHOD_H_
+#include <stdint.h>
+
/*
* rwho protocol packet format.
*/
Index: src/include/protocols/talkd.h
diff -u src/include/protocols/talkd.h:1.10 src/include/protocols/talkd.h:1.11
--- src/include/protocols/talkd.h:1.10 Mon Dec 26 19:01:47 2005
+++ src/include/protocols/talkd.h Fri Jan 22 23:11:50 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: talkd.h,v 1.10 2005/12/26 19:01:47 perry Exp $ */
+/* $NetBSD: talkd.h,v 1.11 2016/01/22 23:11:50 dholland Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -34,6 +34,8 @@
#ifndef _PROTOCOLS_TALKD_H_
#define _PROTOCOLS_TALKD_H_
+#include <stdint.h>
+
/*
* This describes the protocol used by the talk server and clients.
*
@@ -64,10 +66,10 @@ struct talkd_sockaddr {
* Client->server request message format.
*/
typedef struct {
- u_char vers; /* protocol version */
- u_char type; /* request type, see below */
- u_char answer; /* not used */
- u_char pad;
+ unsigned char vers; /* protocol version */
+ unsigned char type; /* request type, see below */
+ unsigned char answer; /* not used */
+ unsigned char pad;
uint32_t id_num; /* message id */
struct talkd_sockaddr addr; /* old (4.3) style */
struct talkd_sockaddr ctl_addr;/* old (4.3) style */
@@ -83,10 +85,10 @@ typedef struct {
* Server->client response message format.
*/
typedef struct {
- u_char vers; /* protocol version */
- u_char type; /* type of request message, see below */
- u_char answer; /* respose to request message, see below */
- u_char pad;
+ unsigned char vers; /* protocol version */
+ unsigned char type; /* type of request message, see below */
+ unsigned char answer; /* respose to request message, see below */
+ unsigned char pad;
uint32_t id_num; /* message id */
struct talkd_sockaddr addr; /* address for establishing conversation */
} CTL_RESPONSE;
Index: src/include/protocols/timed.h
diff -u src/include/protocols/timed.h:1.11 src/include/protocols/timed.h:1.12
--- src/include/protocols/timed.h:1.11 Sat Feb 16 07:30:15 2008
+++ src/include/protocols/timed.h Fri Jan 22 23:11:50 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: timed.h,v 1.11 2008/02/16 07:30:15 matt Exp $ */
+/* $NetBSD: timed.h,v 1.12 2016/01/22 23:11:50 dholland Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -34,6 +34,9 @@
#ifndef _PROTOCOLS_TIMED_H_
#define _PROTOCOLS_TIMED_H_
+#include <stdint.h>
+#include <limits.h>
+
/*
* Time Synchronization Protocol
*/
@@ -52,7 +55,7 @@ struct tsp {
} tspu_time;
char tspu_hopcnt;
} tsp_u;
- char tsp_name[MAXHOSTNAMELEN];
+ char tsp_name[_POSIX_HOST_NAME_MAX];
};
#define tsp_time tsp_u.tspu_time
