From 4d096031f0ad1d094a7d01cb7e56ff6b825a944f Mon Sep 17 00:00:00 2001 From: perry Date: Sat, 15 Dec 2007 16:03:29 +0000 Subject: [PATCH] replace instances of __attribute__((__packed__)) with __packed --- lib/libsdp/search.c | 8 ++++---- sbin/atactl/atactl.c | 8 ++++---- usr.bin/btkey/device.c | 6 +++--- usr.sbin/iopctl/iopctl.c | 10 +++++----- usr.sbin/mlxctl/util.c | 6 +++--- usr.sbin/sdpd/server.c | 8 ++++---- usr.sbin/traceroute/traceroute.c | 6 +++--- 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/lib/libsdp/search.c b/lib/libsdp/search.c index c8d9fd38638e..c68ed1313140 100644 --- a/lib/libsdp/search.c +++ b/lib/libsdp/search.c @@ -1,4 +1,4 @@ -/* $NetBSD: search.c,v 1.2 2007/11/16 19:35:08 plunky Exp $ */ +/* $NetBSD: search.c,v 1.3 2007/12/15 16:03:29 perry Exp $ */ /* * search.c @@ -27,12 +27,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: search.c,v 1.2 2007/11/16 19:35:08 plunky Exp $ + * $Id: search.c,v 1.3 2007/12/15 16:03:29 perry Exp $ * $FreeBSD: src/lib/libsdp/search.c,v 1.8 2007/11/16 15:13:12 emax Exp $ */ #include -__RCSID("$NetBSD: search.c,v 1.2 2007/11/16 19:35:08 plunky Exp $"); +__RCSID("$NetBSD: search.c,v 1.3 2007/12/15 16:03:29 perry Exp $"); #include #include @@ -56,7 +56,7 @@ sdp_search(void *xss, struct sdp_xpdu { sdp_pdu_t pdu; uint16_t len; - } __attribute__ ((packed)) xpdu; + } __packed xpdu; sdp_session_p ss = (sdp_session_p) xss; uint8_t *req = NULL, *rsp = NULL, *rsp_tmp = NULL; diff --git a/sbin/atactl/atactl.c b/sbin/atactl/atactl.c index 294d31920747..5d68e1f0bff6 100644 --- a/sbin/atactl/atactl.c +++ b/sbin/atactl/atactl.c @@ -1,4 +1,4 @@ -/* $NetBSD: atactl.c,v 1.48 2007/11/18 17:48:21 christos Exp $ */ +/* $NetBSD: atactl.c,v 1.49 2007/12/15 16:03:29 perry Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -42,7 +42,7 @@ #include #ifndef lint -__RCSID("$NetBSD: atactl.c,v 1.48 2007/11/18 17:48:21 christos Exp $"); +__RCSID("$NetBSD: atactl.c,v 1.49 2007/12/15 16:03:29 perry Exp $"); #endif @@ -85,7 +85,7 @@ struct ata_smart_error { u_int8_t state; u_int8_t lifetime[2]; } error_data; -} __attribute__((packed)); +} __packed; struct ata_smart_errorlog { u_int8_t data_structure_revision; @@ -94,7 +94,7 @@ struct ata_smart_errorlog { u_int16_t device_error_count; u_int8_t reserved[57]; u_int8_t checksum; -} __attribute__((packed)); +} __packed; struct command { const char *cmd_name; diff --git a/usr.bin/btkey/device.c b/usr.bin/btkey/device.c index 1ba601d1496a..c54ab5ed739d 100644 --- a/usr.bin/btkey/device.c +++ b/usr.bin/btkey/device.c @@ -1,4 +1,4 @@ -/* $NetBSD: device.c,v 1.1 2007/11/09 21:18:25 plunky Exp $ */ +/* $NetBSD: device.c,v 1.2 2007/12/15 16:03:30 perry Exp $ */ /*- * Copyright (c) 2007 Iain Hibbert @@ -28,7 +28,7 @@ */ #include -__RCSID("$NetBSD: device.c,v 1.1 2007/11/09 21:18:25 plunky Exp $"); +__RCSID("$NetBSD: device.c,v 1.2 2007/12/15 16:03:30 perry Exp $"); #include #include @@ -46,7 +46,7 @@ struct stored_link_keys { bdaddr_t addr; uint8_t key[HCI_KEY_SIZE]; } key[1]; -} __attribute__ ((__packed__)); +} __packed; /* * generic request diff --git a/usr.sbin/iopctl/iopctl.c b/usr.sbin/iopctl/iopctl.c index beaf1a1091af..9fc112b0db16 100644 --- a/usr.sbin/iopctl/iopctl.c +++ b/usr.sbin/iopctl/iopctl.c @@ -1,4 +1,4 @@ -/* $NetBSD: iopctl.c,v 1.14 2007/03/26 23:08:29 hubertf Exp $ */ +/* $NetBSD: iopctl.c,v 1.15 2007/12/15 16:03:30 perry Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ #ifndef lint #include -__RCSID("$NetBSD: iopctl.c,v 1.14 2007/03/26 23:08:29 hubertf Exp $"); +__RCSID("$NetBSD: iopctl.c,v 1.15 2007/12/15 16:03:30 perry Exp $"); #endif /* not lint */ #include @@ -205,7 +205,7 @@ getparam(int tid, int group, void *pbuf, int pbufsize) struct { struct i2o_param_op_list_header olh; struct i2o_param_op_all_template oat; - } __attribute__ ((__packed__)) req; + } __packed req; mb.msgflags = I2O_MSGFLAGS(i2o_util_params_op); mb.msgfunc = I2O_MSGFUNC(tid, I2O_UTIL_PARAMS_GET); @@ -347,7 +347,7 @@ showddmid(char **argv) struct i2o_param_read_results prr; struct i2o_param_ddm_identity di; char padding[128]; - } __attribute__ ((__packed__)) p; + } __packed p; char ident[128]; getparam(gettid(argv), I2O_PARAM_DDM_IDENTITY, &p, sizeof(p)); @@ -371,7 +371,7 @@ showdevid(char **argv) struct i2o_param_read_results prr; struct i2o_param_device_identity di; char padding[128]; - } __attribute__ ((__packed__)) p; + } __packed p; char ident[128]; getparam(gettid(argv), I2O_PARAM_DEVICE_IDENTITY, &p, sizeof(p)); diff --git a/usr.sbin/mlxctl/util.c b/usr.sbin/mlxctl/util.c index b772cf6785ba..c921fc0da4b9 100644 --- a/usr.sbin/mlxctl/util.c +++ b/usr.sbin/mlxctl/util.c @@ -1,4 +1,4 @@ -/* $NetBSD: util.c,v 1.4 2002/04/07 20:18:01 ad Exp $ */ +/* $NetBSD: util.c,v 1.5 2007/12/15 16:03:30 perry Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -64,7 +64,7 @@ #ifndef lint #include -__RCSID("$NetBSD: util.c,v 1.4 2002/04/07 20:18:01 ad Exp $"); +__RCSID("$NetBSD: util.c,v 1.5 2007/12/15 16:03:30 perry Exp $"); #endif /* not lint */ #include @@ -177,7 +177,7 @@ mlx_scsi_inquiry(int chan, int targ, char **vendor, char **device, static struct { struct mlx_dcdb dcdb; struct scsipi_inquiry_data inq; - } __attribute__ ((__packed__)) dcdb_cmd; + } __packed dcdb_cmd; struct scsipi_inquiry *inq_cmd; int rv; diff --git a/usr.sbin/sdpd/server.c b/usr.sbin/sdpd/server.c index fba06a8f157c..3d565b0d6642 100644 --- a/usr.sbin/sdpd/server.c +++ b/usr.sbin/sdpd/server.c @@ -1,4 +1,4 @@ -/* $NetBSD: server.c,v 1.3 2007/03/18 10:00:42 plunky Exp $ */ +/* $NetBSD: server.c,v 1.4 2007/12/15 16:03:30 perry Exp $ */ /*- * Copyright (c) 2006 Itronix Inc. @@ -55,12 +55,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: server.c,v 1.3 2007/03/18 10:00:42 plunky Exp $ + * $Id: server.c,v 1.4 2007/12/15 16:03:30 perry Exp $ * $FreeBSD: src/usr.sbin/bluetooth/sdpd/server.c,v 1.2 2005/12/06 17:56:36 emax Exp $ */ #include -__RCSID("$NetBSD: server.c,v 1.3 2007/03/18 10:00:42 plunky Exp $"); +__RCSID("$NetBSD: server.c,v 1.4 2007/12/15 16:03:30 perry Exp $"); #include #include @@ -576,7 +576,7 @@ server_send_error_response(server_p srv, int32_t fd, uint16_t error) struct { sdp_pdu_t pdu; uint16_t error; - } __attribute__ ((packed)) rsp; + } __packed rsp; /* Prepare and send SDP error response */ rsp.pdu.pid = SDP_PDU_ERROR_RESPONSE; diff --git a/usr.sbin/traceroute/traceroute.c b/usr.sbin/traceroute/traceroute.c index 4edada420621..85213cc1ab9c 100644 --- a/usr.sbin/traceroute/traceroute.c +++ b/usr.sbin/traceroute/traceroute.c @@ -1,4 +1,4 @@ -/* $NetBSD: traceroute.c,v 1.69 2007/04/08 09:45:41 scw Exp $ */ +/* $NetBSD: traceroute.c,v 1.70 2007/12/15 16:03:31 perry Exp $ */ /* * Copyright (c) 1988, 1989, 1991, 1994, 1995, 1996, 1997 @@ -29,7 +29,7 @@ static const char rcsid[] = #else __COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1991, 1994, 1995, 1996, 1997\n\ The Regents of the University of California. All rights reserved.\n"); -__RCSID("$NetBSD: traceroute.c,v 1.69 2007/04/08 09:45:41 scw Exp $"); +__RCSID("$NetBSD: traceroute.c,v 1.70 2007/12/15 16:03:31 perry Exp $"); #endif #endif @@ -1307,7 +1307,7 @@ again: u_int8_t zero; u_int8_t protocol; u_int16_t len; - } __attribute__((__packed__)) phdr; + } __packed phdr; /* Checksum */ ui = (struct udpiphdr *)outip;