 @@ -1,14 +1,14 @@
-/*	$NetBSD: bluetooth.h,v 1.4 2009/08/03 15:59:42 plunky Exp $	*/
+/*	$NetBSD: bluetooth.h,v 1.5 2011/11/28 12:44:18 joerg Exp $	*/
 /*-
  * Copyright (c) 2001-2009 Maksim Yevmenkin <m_evmenkin@yahoo.com>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -150,34 +150,34 @@ int	bt_devfilter_evt_tst(const struct bt
 int	bt_devinquiry(const char *, time_t, int, struct bt_devinquiry **);
 int	bt_devinfo(const char *, struct bt_devinfo *);
 int	bt_devenum(bt_devenum_cb_t *, void *);
 /*
  * bthcid(8) PIN Client API
  */
 /* Client PIN Request packet */
 typedef struct {
 	bdaddr_t	laddr;			/* local address */
 	bdaddr_t	raddr;			/* remote address */
 	uint8_t		time;			/* validity (seconds) */
-} __attribute__ ((packed)) bthcid_pin_request_t;
+} __packed bthcid_pin_request_t;
 /* Client PIN Response packet */
 typedef struct {
 	bdaddr_t	laddr;			/* local address */
 	bdaddr_t	raddr;			/* remote address */
 	uint8_t		pin[HCI_PIN_SIZE];	/* PIN */
-} __attribute__ ((packed)) bthcid_pin_response_t;
+} __packed bthcid_pin_response_t;
 /* Default socket name */
 #define BTHCID_SOCKET_NAME	"/var/run/bthcid"
 #ifdef COMPAT_BLUEZ
 /*
  * Linux BlueZ compatibility
  */
 #define	bacmp(ba1, ba2)	memcmp((ba1), (ba2), sizeof(bdaddr_t))
 #define	bacpy(dst, src)	memcpy((dst), (src), sizeof(bdaddr_t))
 #define ba2str(ba, str)	bt_ntoa((ba), (str))
 #define str2ba(str, ba)	(bt_aton((str), (ba)) == 1 ? 0 : -1)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: form.h,v 1.20 2010/02/03 15:34:43 roy Exp $	*/
+/*	$NetBSD: form.h,v 1.21 2011/11/28 12:44:18 joerg Exp $	*/
 /*-
  * Copyright (c) 1998-1999 Brett Lymn
  *               (blymn@baea.com.au, brett_lymn@yahoo.com.au)
  * All rights reserved.
+ *
  * This code has been donated to The NetBSD Foundation by the Author.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -345,28 +345,27 @@ FIELDTYPE   *new_fieldtype(int (* field_
 FORM        *new_form(FIELD **);
 int          new_page(FIELD *);
 int          pos_form_cursor(FORM *);
 int          post_form(FORM *);
 int          scale_form(FORM *, int *, int *);
 int          set_current_field(FORM *, FIELD *);
 int          set_field_back(FIELD *, chtype);
 int          set_field_buffer(FIELD *, int, char *);
 int          set_field_fore(FIELD *, chtype);
 int          set_field_init(FORM *, Form_Hook);
 int          set_field_just(FIELD *, int);
 int          set_field_opts(FIELD *, Form_Options);
 int          set_field_pad(FIELD *, int);
-int          set_field_printf(FIELD *, int, char *, ...)
+int          set_field_printf(FIELD *, int, char *, ...) __printflike(3, 4);
 				__attribute__((__format__(__printf__, 3, 4)));
 int          set_field_status(FIELD *, int);
 int          set_field_term(FORM *, Form_Hook);
 int          set_field_type(FIELD *, FIELDTYPE *, ...);
 int          set_field_userptr(FIELD *, void *);
 int          set_fieldtype_arg(FIELDTYPE *, char *(*)(va_list *),
 			       char *(*)(char *),
 			       void (*)(char *));
 int          set_fieldtype_choice(FIELDTYPE *, int (*)(FIELD *, char *),
 				  int (*)(FIELD *, char *));
 int          set_form_fields(FORM *, FIELD **);
 int          set_form_init(FORM *, Form_Hook);
 int          set_form_opts(FORM *, Form_Options);
 int          set_form_page(FORM *, int);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: isns_pdu.h,v 1.2 2011/08/17 10:08:43 christos Exp $	*/
+/*	$NetBSD: isns_pdu.h,v 1.3 2011/11/28 12:44:18 joerg Exp $	*/
 /*-
  * Copyright (c) 2004,2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -161,32 +161,32 @@ struct isns_trans_s {
 	uint16_t func_id;
 	uint32_t flags;
 	struct isns_config_s *cfg_p;
 	struct isns_get_tlv_info_s get_tlv_info;
 	struct isns_pdu_s *pdu_req_list;
 	struct isns_pdu_s *pdu_rsp_list;
 	uint16_t disconnect_cnt;
 };
 struct isns_pdu_hdr_s {
-	uint16_t isnsp_version	__attribute__ ((packed));
+	uint16_t isnsp_version	__packed;
-	uint16_t func_id	__attribute__ ((packed));
+	uint16_t func_id	__packed;
-	uint16_t payload_len	__attribute__ ((packed));
+	uint16_t payload_len	__packed;
-	uint16_t flags		__attribute__ ((packed));
+	uint16_t flags		__packed;
-	uint16_t trans_id	__attribute__ ((packed));
+	uint16_t trans_id	__packed;
-	uint16_t seq_id		__attribute__ ((packed));
+	uint16_t seq_id		__packed;
 };
 struct isns_pdu_s {
 	struct isns_config_s *cfg_p;
 	struct isns_pdu_hdr_s hdr;
 	int byteorder_host;
 	struct isns_buffer_s *payload_p;
 	struct isns_pdu_s *next;
 };
 #define isns_get_pdu_request(_trans)					\
 	(((_trans) == ISNS_INVALID_TRANS)				\

 @@ -1,14 +1,14 @@
-/* $NetBSD: compile.c,v 1.5 2011/04/11 21:37:19 roy Exp $ */
+/* $NetBSD: compile.c,v 1.6 2011/11/28 12:44:19 joerg Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 The NetBSD Foundation, Inc.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Roy Marples.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -22,46 +22,46 @@
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: compile.c,v 1.5 2011/04/11 21:37:19 roy Exp $");
+__RCSID("$NetBSD: compile.c,v 1.6 2011/11/28 12:44:19 joerg Exp $");
 #if !HAVE_NBTOOL_CONFIG_H || HAVE_SYS_ENDIAN_H
 #include <sys/endian.h>
 #endif
 #include <assert.h>
 #include <ctype.h>
 #include <err.h>
 #include <errno.h>
 #include <limits.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 #include <term_private.h>
 #include <term.h>
-static void __attribute__((__format__(__printf__, 2, 3)))
+static void __printflike(2, 3)
 dowarn(int flags, const char *fmt, ...)
+{
 	va_list va;
 	errno = EINVAL;
 	if (flags & TIC_WARNING) {
 		va_start(va, fmt);
 		vwarnx(fmt, va);
 		va_end(va);
+	}
+}
 char *