From owner-svn-src-head@FreeBSD.ORG Mon Aug 30 22:26:42 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id B5C401065679;
Mon, 30 Aug 2010 22:26:42 +0000 (UTC) (envelope-from pjd@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id A490D8FC1C;
Mon, 30 Aug 2010 22:26:42 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o7UMQgxs009692;
Mon, 30 Aug 2010 22:26:42 GMT (envelope-from pjd@svn.freebsd.org)
Received: (from pjd@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7UMQgv2009687;
Mon, 30 Aug 2010 22:26:42 GMT (envelope-from pjd@svn.freebsd.org)
Message-Id: <201008302226.o7UMQgv2009687@svn.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Mon, 30 Aug 2010 22:26:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r212033 - head/sbin/hastd
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Aug 2010 22:26:42 -0000
Author: pjd
Date: Mon Aug 30 22:26:42 2010
New Revision: 212033
URL: http://svn.freebsd.org/changeset/base/212033
Log:
Constify arguments we can constify.
MFC after: 2 weeks
Obtained from: Wheel Systems Sp. z o.o. http://www.wheelsystems.com
Modified:
head/sbin/hastd/hast_proto.c
head/sbin/hastd/hast_proto.h
head/sbin/hastd/proto.c
head/sbin/hastd/proto.h
Modified: head/sbin/hastd/hast_proto.c
==============================================================================
--- head/sbin/hastd/hast_proto.c Mon Aug 30 22:24:26 2010 (r212032)
+++ head/sbin/hastd/hast_proto.c Mon Aug 30 22:26:42 2010 (r212033)
@@ -56,8 +56,10 @@ struct hast_main_header {
uint32_t size;
} __packed;
-typedef int hps_send_t(struct hast_resource *, struct nv *nv, void **, size_t *, bool *);
-typedef int hps_recv_t(struct hast_resource *, struct nv *nv, void **, size_t *, bool *);
+typedef int hps_send_t(const struct hast_resource *, struct nv *nv, void **,
+ size_t *, bool *);
+typedef int hps_recv_t(const struct hast_resource *, struct nv *nv, void **,
+ size_t *, bool *);
struct hast_pipe_stage {
const char *hps_name;
@@ -65,14 +67,14 @@ struct hast_pipe_stage {
hps_recv_t *hps_recv;
};
-static int compression_send(struct hast_resource *res, struct nv *nv,
+static int compression_send(const struct hast_resource *res, struct nv *nv,
void **datap, size_t *sizep, bool *freedatap);
-static int compression_recv(struct hast_resource *res, struct nv *nv,
+static int compression_recv(const struct hast_resource *res, struct nv *nv,
void **datap, size_t *sizep, bool *freedatap);
#ifdef HAVE_CRYPTO
-static int checksum_send(struct hast_resource *res, struct nv *nv,
+static int checksum_send(const struct hast_resource *res, struct nv *nv,
void **datap, size_t *sizep, bool *freedatap);
-static int checksum_recv(struct hast_resource *res, struct nv *nv,
+static int checksum_recv(const struct hast_resource *res, struct nv *nv,
void **datap, size_t *sizep, bool *freedatap);
#endif
@@ -84,7 +86,7 @@ static struct hast_pipe_stage pipeline[]
};
static int
-compression_send(struct hast_resource *res, struct nv *nv, void **datap,
+compression_send(const struct hast_resource *res, struct nv *nv, void **datap,
size_t *sizep, bool *freedatap)
{
unsigned char *newbuf;
@@ -132,7 +134,7 @@ compression_send(struct hast_resource *r
}
static int
-compression_recv(struct hast_resource *res, struct nv *nv, void **datap,
+compression_recv(const struct hast_resource *res, struct nv *nv, void **datap,
size_t *sizep, bool *freedatap)
{
unsigned char *newbuf;
@@ -169,7 +171,7 @@ compression_recv(struct hast_resource *r
#ifdef HAVE_CRYPTO
static int
-checksum_send(struct hast_resource *res, struct nv *nv, void **datap,
+checksum_send(const struct hast_resource *res, struct nv *nv, void **datap,
size_t *sizep, bool *freedatap __unused)
{
unsigned char hash[SHA256_DIGEST_LENGTH];
@@ -188,7 +190,7 @@ checksum_send(struct hast_resource *res,
}
static int
-checksum_recv(struct hast_resource *res, struct nv *nv, void **datap,
+checksum_recv(const struct hast_resource *res, struct nv *nv, void **datap,
size_t *sizep, bool *freedatap __unused)
{
unsigned char chash[SHA256_DIGEST_LENGTH];
@@ -236,7 +238,7 @@ checksum_recv(struct hast_resource *res,
* There can be no data at all (data is NULL then).
*/
int
-hast_proto_send(struct hast_resource *res, struct proto_conn *conn,
+hast_proto_send(const struct hast_resource *res, struct proto_conn *conn,
struct nv *nv, const void *data, size_t size)
{
struct hast_main_header hdr;
@@ -293,7 +295,7 @@ end:
}
int
-hast_proto_recv_hdr(struct proto_conn *conn, struct nv **nvp)
+hast_proto_recv_hdr(const struct proto_conn *conn, struct nv **nvp)
{
struct hast_main_header hdr;
struct nv *nv;
@@ -335,7 +337,7 @@ fail:
}
int
-hast_proto_recv_data(struct hast_resource *res, struct proto_conn *conn,
+hast_proto_recv_data(const struct hast_resource *res, struct proto_conn *conn,
struct nv *nv, void *data, size_t size)
{
unsigned int ii;
@@ -384,7 +386,7 @@ if (ret < 0) printf("%s:%u %s\n", __func
}
int
-hast_proto_recv(struct hast_resource *res, struct proto_conn *conn,
+hast_proto_recv(const struct hast_resource *res, struct proto_conn *conn,
struct nv **nvp, void *data, size_t size)
{
struct nv *nv;
Modified: head/sbin/hastd/hast_proto.h
==============================================================================
--- head/sbin/hastd/hast_proto.h Mon Aug 30 22:24:26 2010 (r212032)
+++ head/sbin/hastd/hast_proto.h Mon Aug 30 22:26:42 2010 (r212033)
@@ -37,12 +37,12 @@
#include <nv.h>
#include <proto.h>
-int hast_proto_send(struct hast_resource *res, struct proto_conn *conn,
+int hast_proto_send(const struct hast_resource *res, struct proto_conn *conn,
struct nv *nv, const void *data, size_t size);
-int hast_proto_recv(struct hast_resource *res, struct proto_conn *conn,
+int hast_proto_recv(const struct hast_resource *res, struct proto_conn *conn,
struct nv **nvp, void *data, size_t size);
-int hast_proto_recv_hdr(struct proto_conn *conn, struct nv **nvp);
-int hast_proto_recv_data(struct hast_resource *res, struct proto_conn *conn,
- struct nv *nv, void *data, size_t size);
+int hast_proto_recv_hdr(const struct proto_conn *conn, struct nv **nvp);
+int hast_proto_recv_data(const struct hast_resource *res,
+ struct proto_conn *conn, struct nv *nv, void *data, size_t size);
#endif /* !_HAST_PROTO_H_ */
Modified: head/sbin/hastd/proto.c
==============================================================================
--- head/sbin/hastd/proto.c Mon Aug 30 22:24:26 2010 (r212032)
+++ head/sbin/hastd/proto.c Mon Aug 30 22:26:42 2010 (r212033)
@@ -179,7 +179,7 @@ proto_accept(struct proto_conn *conn, st
}
int
-proto_send(struct proto_conn *conn, const void *data, size_t size)
+proto_send(const struct proto_conn *conn, const void *data, size_t size)
{
int ret;
@@ -196,7 +196,7 @@ proto_send(struct proto_conn *conn, cons
}
int
-proto_recv(struct proto_conn *conn, void *data, size_t size)
+proto_recv(const struct proto_conn *conn, void *data, size_t size)
{
int ret;
Modified: head/sbin/hastd/proto.h
==============================================================================
--- head/sbin/hastd/proto.h Mon Aug 30 22:24:26 2010 (r212032)
+++ head/sbin/hastd/proto.h Mon Aug 30 22:26:42 2010 (r212033)
@@ -41,8 +41,8 @@ int proto_client(const char *addr, struc
int proto_connect(struct proto_conn *conn);
int proto_server(const char *addr, struct proto_conn **connp);
int proto_accept(struct proto_conn *conn, struct proto_conn **newconnp);
-int proto_send(struct proto_conn *conn, const void *data, size_t size);
-int proto_recv(struct proto_conn *conn, void *data, size_t size);
+int proto_send(const struct proto_conn *conn, const void *data, size_t size);
+int proto_recv(const struct proto_conn *conn, void *data, size_t size);
int proto_descriptor(const struct proto_conn *conn);
bool proto_address_match(const struct proto_conn *conn, const char *addr);
void proto_local_address(const struct proto_conn *conn, char *addr,