summaryrefslogtreecommitdiff
path: root/libexec
diff options
context:
space:
mode:
authorperry <perry@NetBSD.org>2007-12-15 19:44:37 +0000
committerperry <perry@NetBSD.org>2007-12-15 19:44:37 +0000
commit8b0f9554ff8762542c4defc4f70e1eb76fb508fa (patch)
treee4ba004e9b95ba0118be0965790e81f9b4803609 /libexec
parent381f4068aea50b74700b6a03c4ae538254ae6be3 (diff)
convert __attribute__s to applicable cdefs.h macros
Diffstat (limited to 'libexec')
-rw-r--r--libexec/atrun/atrun.c8
-rw-r--r--libexec/rexecd/rexecd.c8
-rw-r--r--libexec/rexecd/unit-tests/rexec.c6
-rw-r--r--libexec/rpc.rusersd/rusersd.c6
-rw-r--r--libexec/rshd/rshd.c6
5 files changed, 17 insertions, 17 deletions
diff --git a/libexec/atrun/atrun.c b/libexec/atrun/atrun.c
index 29cf9819fc9..fb2ab0b026f 100644
--- a/libexec/atrun/atrun.c
+++ b/libexec/atrun/atrun.c
@@ -1,4 +1,4 @@
-/* $NetBSD: atrun.c,v 1.17 2007/12/15 16:32:05 perry Exp $ */
+/* $NetBSD: atrun.c,v 1.18 2007/12/15 19:44:45 perry Exp $ */
/*
* atrun.c - run jobs queued by at; run with root privileges.
@@ -59,14 +59,14 @@
#if 0
static char rcsid[] = "$OpenBSD: atrun.c,v 1.7 1997/09/08 22:12:10 millert Exp $";
#else
-__RCSID("$NetBSD: atrun.c,v 1.17 2007/12/15 16:32:05 perry Exp $");
+__RCSID("$NetBSD: atrun.c,v 1.18 2007/12/15 19:44:45 perry Exp $");
#endif
static int debug = 0;
/* Local functions */
-static void perr(const char *, ...) __attribute__((__noreturn__));
-static void perrx(const char *, ...) __attribute__((__noreturn__));
+static void perr(const char *, ...) __dead;
+static void perrx(const char *, ...) __dead;
static int write_string(int, const char *);
static void run_file(const char *, uid_t, gid_t);
static void become_user(struct passwd *, uid_t);
diff --git a/libexec/rexecd/rexecd.c b/libexec/rexecd/rexecd.c
index 15d60659ff8..4faefe99bb0 100644
--- a/libexec/rexecd/rexecd.c
+++ b/libexec/rexecd/rexecd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rexecd.c,v 1.24 2006/05/11 00:22:52 mrg Exp $ */
+/* $NetBSD: rexecd.c,v 1.25 2007/12/15 19:44:46 perry Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -36,7 +36,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1993\n\
#if 0
static char sccsid[] = "from: @(#)rexecd.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: rexecd.c,v 1.24 2006/05/11 00:22:52 mrg Exp $");
+__RCSID("$NetBSD: rexecd.c,v 1.25 2007/12/15 19:44:46 perry Exp $");
#endif
#endif /* not lint */
@@ -69,9 +69,9 @@ __RCSID("$NetBSD: rexecd.c,v 1.24 2006/05/11 00:22:52 mrg Exp $");
int main(int, char *[]);
static void rexecd_errx(int, const char *, ...)
__attribute__((__noreturn__, __format__(__printf__, 2, 3)));
-static void doit(struct sockaddr *) __attribute__((__noreturn__));
+static void doit(struct sockaddr *) __dead;
static void getstr(char *, int, const char *);
-static void usage(void) __attribute__((__noreturn__));
+static void usage(void) __dead;
#ifdef USE_PAM
static pam_handle_t *pamh;
diff --git a/libexec/rexecd/unit-tests/rexec.c b/libexec/rexecd/unit-tests/rexec.c
index d354cf32345..36e8f5c583e 100644
--- a/libexec/rexecd/unit-tests/rexec.c
+++ b/libexec/rexecd/unit-tests/rexec.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rexec.c,v 1.2 2005/02/27 01:34:07 christos Exp $ */
+/* $NetBSD: rexec.c,v 1.3 2007/12/15 19:44:46 perry Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: rexec.c,v 1.2 2005/02/27 01:34:07 christos Exp $");
+__RCSID("$NetBSD: rexec.c,v 1.3 2007/12/15 19:44:46 perry Exp $");
#include <stdio.h>
#include <netdb.h>
@@ -44,7 +44,7 @@ __RCSID("$NetBSD: rexec.c,v 1.2 2005/02/27 01:34:07 christos Exp $");
#include <unistd.h>
#include <err.h>
-static void usage(void) __attribute__((__noreturn__));
+static void usage(void) __dead;
/*XXX*/
int rexec(char **, int, char *, char *, char *, int *);
diff --git a/libexec/rpc.rusersd/rusersd.c b/libexec/rpc.rusersd/rusersd.c
index 1a6076fd4f3..3c70797e04b 100644
--- a/libexec/rpc.rusersd/rusersd.c
+++ b/libexec/rpc.rusersd/rusersd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rusersd.c,v 1.16 2006/05/09 20:18:07 mrg Exp $ */
+/* $NetBSD: rusersd.c,v 1.17 2007/12/15 19:44:46 perry Exp $ */
/*-
* Copyright (c) 1993 John Brezak
@@ -30,7 +30,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: rusersd.c,v 1.16 2006/05/09 20:18:07 mrg Exp $");
+__RCSID("$NetBSD: rusersd.c,v 1.17 2007/12/15 19:44:46 perry Exp $");
#endif /* not lint */
#include <stdio.h>
@@ -47,7 +47,7 @@ __RCSID("$NetBSD: rusersd.c,v 1.16 2006/05/09 20:18:07 mrg Exp $");
int from_inetd = 1;
-static void cleanup(int) __attribute__((__noreturn__));
+static void cleanup(int) __dead;
static void
/*ARGSUSED*/
diff --git a/libexec/rshd/rshd.c b/libexec/rshd/rshd.c
index 7655f2d06d2..a26165d9cb2 100644
--- a/libexec/rshd/rshd.c
+++ b/libexec/rshd/rshd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rshd.c,v 1.44 2006/05/09 20:18:07 mrg Exp $ */
+/* $NetBSD: rshd.c,v 1.45 2007/12/15 19:44:46 perry Exp $ */
/*
* Copyright (C) 1998 WIDE Project.
@@ -69,7 +69,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1992, 1993, 1994\n\
#if 0
static char sccsid[] = "@(#)rshd.c 8.2 (Berkeley) 4/6/94";
#else
-__RCSID("$NetBSD: rshd.c,v 1.44 2006/05/09 20:18:07 mrg Exp $");
+__RCSID("$NetBSD: rshd.c,v 1.45 2007/12/15 19:44:46 perry Exp $");
#endif
#endif /* not lint */
@@ -137,7 +137,7 @@ int check_all;
int log_success; /* If TRUE, log all successful accesses */
int sent_null;
-void doit(struct sockaddr *) __attribute__((__noreturn__));
+void doit(struct sockaddr *) __dead;
void rshd_errx(int, const char *, ...)
__attribute__((__noreturn__, __format__(__printf__, 2, 3)));
void getstr(char *, int, const char *);