[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU Inetutils branch, master, updated. v2.2-4-gfc310f0
|
From: |
Simon Josefsson |
|
Subject: |
[SCM] GNU Inetutils branch, master, updated. v2.2-4-gfc310f0 |
|
Date: |
Wed, 1 Sep 2021 16:51:59 -0400 (EDT) |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".
The branch, master has been updated
via fc310f059c59884a2217606df62b444887c86f84 (commit)
via 0ceee232623b2ed93bdf96bad6e0f4e4834f31aa (commit)
via 0e4832e73a93ecd3f3365b540242839ac99343dc (commit)
from 8780b47a7fd029c8ffadb54841863964cde00f18 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=fc310f059c59884a2217606df62b444887c86f84
commit fc310f059c59884a2217606df62b444887c86f84
Author: Simon Josefsson <simon@josefsson.org>
Date: Wed Sep 1 22:51:24 2021 +0200
Don't use obsolete AC_TYPE_SIGNAL.
* configure.ac: Remove call to AC_TYPE_SIGNAL.
diff --git a/configure.ac b/configure.ac
index 5e16c3a..dd1d762 100644
--- a/configure.ac
+++ b/configure.ac
@@ -650,9 +650,6 @@ fi
### Checks for types.
-# Checks return type of signal handlers
-AC_TYPE_SIGNAL
-
AC_CHECK_TYPES(struct if_nameindex, , ,
[IU_FLUSHLEFT([#include <sys/types.h>
#include <sys/socket.h>
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=0ceee232623b2ed93bdf96bad6e0f4e4834f31aa
commit 0ceee232623b2ed93bdf96bad6e0f4e4834f31aa
Author: Simon Josefsson <simon@josefsson.org>
Date: Wed Sep 1 22:49:18 2021 +0200
Use gnulib module 'attribute' instead of obsolete
'snippets/unused-parameters'.
* */*.c: Use MAYBE_UNUSED instead of _GL_UNUSED_PARAMETER.
* */*.c: Include attribute.h instead of unused-parameters.h.
diff --git a/bootstrap.conf b/bootstrap.conf
index ed51c93..f347d47 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -40,6 +40,7 @@ alloca
alloca-opt
argp
argp-version-etc
+attribute
autobuild
dirfd
dirname-lgpl
@@ -84,7 +85,6 @@ setenv
sethostname
signal
size_max
-snippet/unused-parameter
snprintf
socklen
stdarg
diff --git a/ftp/cmds.c b/ftp/cmds.c
index 780abc8..559a121 100644
--- a/ftp/cmds.c
+++ b/ftp/cmds.c
@@ -91,7 +91,7 @@
#endif
#include "ftp_var.h"
-#include "unused-parameter.h"
+#include "attribute.h"
#include "xalloc.h"
#include "xgetcwd.h"
@@ -481,7 +481,7 @@ char *stype[] = {
* Set binary transfer type.
*/
void
-setbinary (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+setbinary (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
{
stype[1] = "binary";
@@ -492,7 +492,7 @@ setbinary (int argc _GL_UNUSED_PARAMETER, char **argv
_GL_UNUSED_PARAMETER)
* Set ascii transfer type.
*/
void
-setascii (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+setascii (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
{
stype[1] = "ascii";
@@ -503,7 +503,7 @@ setascii (int argc _GL_UNUSED_PARAMETER, char **argv
_GL_UNUSED_PARAMETER)
* Set tenex transfer type.
*/
void
-settenex (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+settenex (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
{
stype[1] = "tenex";
@@ -514,7 +514,7 @@ settenex (int argc _GL_UNUSED_PARAMETER, char **argv
_GL_UNUSED_PARAMETER)
* Set file transfer mode.
*/
void
-setftmode (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+setftmode (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
{
printf ("We only support %s mode, sorry.\n", modename);
@@ -525,7 +525,7 @@ setftmode (int argc _GL_UNUSED_PARAMETER, char **argv
_GL_UNUSED_PARAMETER)
* Set file transfer format.
*/
void
-setform (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+setform (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
{
printf ("We only support %s format, sorry.\n", formname);
@@ -536,7 +536,7 @@ setform (int argc _GL_UNUSED_PARAMETER, char **argv
_GL_UNUSED_PARAMETER)
* Set file transfer structure.
*/
void
-setstruct (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+setstruct (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
{
printf ("We only support %s structure, sorry.\n", structname);
@@ -914,7 +914,7 @@ getit (int argc, char **argv, int restartit, char *mode)
}
void
-mabort (int signo _GL_UNUSED_PARAMETER)
+mabort (int signo MAYBE_UNUSED)
{
int ointer;
@@ -1127,7 +1127,7 @@ onoff (int bool)
* Show status.
*/
void
-status (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+status (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
{
int i;
@@ -1192,7 +1192,7 @@ status (int argc _GL_UNUSED_PARAMETER, char **argv
_GL_UNUSED_PARAMETER)
* Set beep on cmd completed mode.
*/
void
-setbell (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+setbell (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
{
bell = !bell;
@@ -1204,7 +1204,7 @@ setbell (int argc _GL_UNUSED_PARAMETER, char **argv
_GL_UNUSED_PARAMETER)
* Turn on packet tracing.
*/
void
-settrace (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+settrace (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
{
trace = !trace;
@@ -1223,7 +1223,7 @@ settrace (int argc _GL_UNUSED_PARAMETER, char **argv
_GL_UNUSED_PARAMETER)
* Toggle state only in absence of an argument.
*/
void
-sethash (int argc _GL_UNUSED_PARAMETER, char **argv)
+sethash (int argc MAYBE_UNUSED, char **argv)
{
char *p = argv[1];
@@ -1273,7 +1273,7 @@ sethash (int argc _GL_UNUSED_PARAMETER, char **argv)
* Turn on printing of server echo's.
*/
void
-setverbose (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+setverbose (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
{
verbose = !verbose;
@@ -1285,7 +1285,7 @@ setverbose (int argc _GL_UNUSED_PARAMETER, char **argv
_GL_UNUSED_PARAMETER)
* Allow any address family.
*/
void
-setipany (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+setipany (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
{
usefamily = AF_UNSPEC;
printf ("Selecting addresses: %s.\n", "any");
@@ -1296,7 +1296,7 @@ setipany (int argc _GL_UNUSED_PARAMETER, char **argv
_GL_UNUSED_PARAMETER)
* Restrict to IPv4 addresses.
*/
void
-setipv4 (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+setipv4 (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
{
usefamily = AF_INET;
printf ("Selecting addresses: %s.\n", "IPv4");
@@ -1307,7 +1307,7 @@ setipv4 (int argc _GL_UNUSED_PARAMETER, char **argv
_GL_UNUSED_PARAMETER)
* Restrict to IPv6 addresses.
*/
void
-setipv6 (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+setipv6 (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
{
usefamily = AF_INET6;
printf ("Selecting addresses: %s.\n", "IPv6");
@@ -1318,7 +1318,7 @@ setipv6 (int argc _GL_UNUSED_PARAMETER, char **argv
_GL_UNUSED_PARAMETER)
* Toggle use of EPRT/EPRT for IPv4.
*/
void
-setepsv4 (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+setepsv4 (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
{
doepsv4 = !doepsv4;
@@ -1330,7 +1330,7 @@ setepsv4 (int argc _GL_UNUSED_PARAMETER, char **argv
_GL_UNUSED_PARAMETER)
* Toggle PORT cmd use before each data connection.
*/
void
-setport (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+setport (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
{
sendport = !sendport;
@@ -1343,7 +1343,7 @@ setport (int argc _GL_UNUSED_PARAMETER, char **argv
_GL_UNUSED_PARAMETER)
* during mget, mput, and mdelete.
*/
void
-setprompt (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+setprompt (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
{
interactive = !interactive;
@@ -1356,7 +1356,7 @@ setprompt (int argc _GL_UNUSED_PARAMETER, char **argv
_GL_UNUSED_PARAMETER)
* on local file names.
*/
void
-setglob (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+setglob (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
{
doglob = !doglob;
@@ -1659,7 +1659,7 @@ mls (int argc, char **argv)
* Do a shell escape
*/
void
-shell (int argc, char **argv _GL_UNUSED_PARAMETER)
+shell (int argc, char **argv MAYBE_UNUSED)
{
pid_t pid;
sighandler_t old1, old2;
@@ -1790,7 +1790,7 @@ user (int argc, char **argv)
* Print working directory.
*/
void
-pwd (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+pwd (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
{
int oldverbose = verbose;
@@ -1810,7 +1810,7 @@ pwd (int argc _GL_UNUSED_PARAMETER, char **argv
_GL_UNUSED_PARAMETER)
* Print local working directory.
*/
void
-lpwd (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+lpwd (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
{
char *dir = xgetcwd ();
@@ -1982,7 +1982,7 @@ rmthelp (int argc, char **argv)
* Terminate session and exit.
*/
void
-quit (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+quit (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
{
if (connected)
@@ -1999,7 +1999,7 @@ quit (int argc _GL_UNUSED_PARAMETER, char **argv
_GL_UNUSED_PARAMETER)
* Terminate session, but don't exit.
*/
void
-disconnect (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+disconnect (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
{
if (!connected)
@@ -2107,7 +2107,7 @@ account (int argc, char **argv)
jmp_buf abortprox;
void
-proxabort (int sig _GL_UNUSED_PARAMETER)
+proxabort (int sig MAYBE_UNUSED)
{
if (!proxy)
@@ -2190,7 +2190,7 @@ doproxy (int argc, char **argv)
}
void
-setcase (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+setcase (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
{
mcase = !mcase;
@@ -2199,7 +2199,7 @@ setcase (int argc _GL_UNUSED_PARAMETER, char **argv
_GL_UNUSED_PARAMETER)
}
void
-setcr (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+setcr (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
{
crflag = !crflag;
@@ -2267,7 +2267,7 @@ dotrans (char *name)
}
void
-setpassive (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+setpassive (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
{
passivemode = !passivemode;
@@ -2526,7 +2526,7 @@ domap (char *name)
}
void
-setsunique (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+setsunique (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
{
sunique = !sunique;
@@ -2535,7 +2535,7 @@ setsunique (int argc _GL_UNUSED_PARAMETER, char **argv
_GL_UNUSED_PARAMETER)
}
void
-setrunique (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+setrunique (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
{
runique = !runique;
@@ -2545,7 +2545,7 @@ setrunique (int argc _GL_UNUSED_PARAMETER, char **argv
_GL_UNUSED_PARAMETER)
/* change directory to parent directory */
void
-cdup (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+cdup (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
{
if (command ("CDUP") == ERROR && code == 500)
@@ -2573,7 +2573,7 @@ restart (int argc, char **argv)
/* show remote system type */
void
-syst (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+syst (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
{
command ("SYST");
diff --git a/ftp/ftp.c b/ftp/ftp.c
index 7513539..730a855 100644
--- a/ftp/ftp.c
+++ b/ftp/ftp.c
@@ -91,7 +91,7 @@
#endif
#include "ftp_var.h"
-#include "unused-parameter.h"
+#include "attribute.h"
#if !HAVE_DECL_FCLOSE
/* Some systems don't declare fclose in <stdio.h>, so do it ourselves. */
@@ -410,7 +410,7 @@ login (char *host)
}
void
-cmdabort (int sig _GL_UNUSED_PARAMETER)
+cmdabort (int sig MAYBE_UNUSED)
{
printf ("\n");
@@ -597,7 +597,7 @@ empty (fd_set *mask, int sec)
jmp_buf sendabort;
void
-abortsend (int sig _GL_UNUSED_PARAMETER)
+abortsend (int sig MAYBE_UNUSED)
{
mflag = 0;
@@ -902,7 +902,7 @@ abort:
jmp_buf recvabort;
void
-abortrecv (int sig _GL_UNUSED_PARAMETER)
+abortrecv (int sig MAYBE_UNUSED)
{
mflag = 0;
@@ -1669,7 +1669,7 @@ tvsub (struct timeval *tdiff, struct timeval *t1, struct
timeval *t0)
}
void
-psabort (int sig _GL_UNUSED_PARAMETER)
+psabort (int sig MAYBE_UNUSED)
{
abrtflag++;
@@ -1782,7 +1782,7 @@ pswitch (int flag)
}
void
-abortpt (int sig _GL_UNUSED_PARAMETER)
+abortpt (int sig MAYBE_UNUSED)
{
printf ("\n");
@@ -1924,7 +1924,7 @@ abort:
}
void
-reset (int argc _GL_UNUSED_PARAMETER, char **argv _GL_UNUSED_PARAMETER)
+reset (int argc MAYBE_UNUSED, char **argv MAYBE_UNUSED)
{
fd_set mask;
int nfnd = 1;
diff --git a/ftp/main.c b/ftp/main.c
index b6b6c27..666c866 100644
--- a/ftp/main.c
+++ b/ftp/main.c
@@ -81,7 +81,7 @@
#include "ftp_var.h"
#include "libinetutils.h"
-#include "unused-parameter.h"
+#include "attribute.h"
#ifdef HAVE_READLINE_READLINE_H
# include <readline/readline.h>
@@ -142,7 +142,7 @@ static struct argp_option argp_options[] = {
};
static error_t
-parse_opt (int key, char *arg, struct argp_state *state _GL_UNUSED_PARAMETER)
+parse_opt (int key, char *arg, struct argp_state *state MAYBE_UNUSED)
{
switch (key)
{
@@ -316,13 +316,13 @@ main (int argc, char *argv[])
}
void
-intr (int sig _GL_UNUSED_PARAMETER)
+intr (int sig MAYBE_UNUSED)
{
longjmp (toplevel, 1);
}
void
-lostpeer (int sig _GL_UNUSED_PARAMETER)
+lostpeer (int sig MAYBE_UNUSED)
{
if (connected)
{
diff --git a/ftpd/ftpd.c b/ftpd/ftpd.c
index 68d41fd..f4b29d5 100644
--- a/ftpd/ftpd.c
+++ b/ftpd/ftpd.c
@@ -104,7 +104,7 @@
#include <progname.h>
#include <libinetutils.h>
#include "extern.h"
-#include "unused-parameter.h"
+#include "attribute.h"
#ifndef LINE_MAX
# define LINE_MAX 2048
@@ -634,7 +634,7 @@ sigquit (int signo)
static void
-lostconn (int signo _GL_UNUSED_PARAMETER)
+lostconn (int signo MAYBE_UNUSED)
{
if (debug)
syslog (LOG_DEBUG, "lost connection");
@@ -1919,7 +1919,7 @@ dologout (int status)
}
static void
-myoob (int signo _GL_UNUSED_PARAMETER)
+myoob (int signo MAYBE_UNUSED)
{
char *cp;
diff --git a/ftpd/pam.c b/ftpd/pam.c
index e1075d6..8c7a361 100644
--- a/ftpd/pam.c
+++ b/ftpd/pam.c
@@ -25,7 +25,7 @@
#include <stdlib.h>
#include <unistd.h>
#include <syslog.h>
-#include <unused-parameter.h>
+#include <attribute.h>
#include "extern.h"
#ifdef HAVE_SECURITY_PAM_APPL_H
@@ -314,7 +314,7 @@ pam_pass (const char *passwd, struct credentials *pcred)
}
void
-pam_end_login (struct credentials * pcred _GL_UNUSED_PARAMETER)
+pam_end_login (struct credentials * pcred MAYBE_UNUSED)
{
int error;
diff --git a/ftpd/server_mode.c b/ftpd/server_mode.c
index f9dfe8f..dbcec59 100644
--- a/ftpd/server_mode.c
+++ b/ftpd/server_mode.c
@@ -39,7 +39,7 @@
#endif
#include <libinetutils.h>
-#include "unused-parameter.h"
+#include "attribute.h"
int usefamily = AF_UNSPEC; /* Address family for daemon. */
@@ -97,7 +97,7 @@ check_host (struct sockaddr *sa, socklen_t len)
#endif /* WITH_WRAP */
static void
-reapchild (int signo _GL_UNUSED_PARAMETER)
+reapchild (int signo MAYBE_UNUSED)
{
int save_errno = errno;
diff --git a/ifconfig/options.c b/ifconfig/options.c
index 10bf4be..c6721ba 100644
--- a/ifconfig/options.c
+++ b/ifconfig/options.c
@@ -39,7 +39,7 @@
#include <sys/socket.h>
#include <net/if.h>
-#include <unused-parameter.h>
+#include <attribute.h>
#include "ifconfig.h"
@@ -380,7 +380,7 @@ void parse_opt_set_af (struct ifconfig *ifp, char *af)
}
void
-parse_opt_set_flag (struct ifconfig *ifp _GL_UNUSED_PARAMETER,
+parse_opt_set_flag (struct ifconfig *ifp MAYBE_UNUSED,
int flag, int rev)
{
if (ifp)
@@ -614,7 +614,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
static char *
default_help_filter (int key, const char *text,
- void *input _GL_UNUSED_PARAMETER)
+ void *input MAYBE_UNUSED)
{
char *s;
diff --git a/ifconfig/printif.c b/ifconfig/printif.c
index 60c26ea..17667a8 100644
--- a/ifconfig/printif.c
+++ b/ifconfig/printif.c
@@ -48,7 +48,7 @@
#include <arpa/inet.h>
#include "ifconfig.h"
#include "xalloc.h"
-#include <unused-parameter.h>
+#include <attribute.h>
FILE *ostream; /* Either stdout or stderror. */
int column_stdout; /* The column position of the cursor on stdout.
*/
@@ -120,7 +120,7 @@ struct format_handle format_handles[] = {
/* Various helper functions to get the job done. */
void
-put_char (format_data_t form _GL_UNUSED_PARAMETER, char c)
+put_char (format_data_t form MAYBE_UNUSED, char c)
{
switch (c)
{
@@ -148,7 +148,7 @@ put_string (format_data_t form, const char *s)
}
void
-put_int (format_data_t form _GL_UNUSED_PARAMETER,
+put_int (format_data_t form MAYBE_UNUSED,
int argc, char *argv[], int nr)
{
char *fmt;
@@ -205,7 +205,7 @@ put_int (format_data_t form _GL_UNUSED_PARAMETER,
}
void
-put_ulong (format_data_t form _GL_UNUSED_PARAMETER,
+put_ulong (format_data_t form MAYBE_UNUSED,
int argc, char *argv[], unsigned long value)
{
char *fmt;
@@ -346,8 +346,8 @@ put_flags (format_data_t form, int argc, char *argv[], int
flags)
}
void
-put_flags_short (format_data_t form, int argc _GL_UNUSED_PARAMETER,
- char *argv[] _GL_UNUSED_PARAMETER, int flags)
+put_flags_short (format_data_t form, int argc MAYBE_UNUSED,
+ char *argv[] MAYBE_UNUSED, int flags)
{
char buf[IF_FORMAT_FLAGS_BUFSIZE];
if_format_flags (flags, buf, sizeof buf);
@@ -378,9 +378,9 @@ format_handler (const char *name, format_data_t form, int
argc, char *argv[])
}
void
-fh_nothing (format_data_t form _GL_UNUSED_PARAMETER,
- int argc _GL_UNUSED_PARAMETER,
- char *argv[] _GL_UNUSED_PARAMETER)
+fh_nothing (format_data_t form MAYBE_UNUSED,
+ int argc MAYBE_UNUSED,
+ char *argv[] MAYBE_UNUSED)
{
}
@@ -439,15 +439,15 @@ fh_foreachformat (format_data_t form, int argc, char
*argv[])
}
void
-fh_newline (format_data_t form, int argc _GL_UNUSED_PARAMETER,
- char *argv[] _GL_UNUSED_PARAMETER)
+fh_newline (format_data_t form, int argc MAYBE_UNUSED,
+ char *argv[] MAYBE_UNUSED)
{
put_char (form, '\n');
}
void
-fh_tabulator (format_data_t form, int argc _GL_UNUSED_PARAMETER,
- char *argv[] _GL_UNUSED_PARAMETER)
+fh_tabulator (format_data_t form, int argc MAYBE_UNUSED,
+ char *argv[] MAYBE_UNUSED)
{
put_char (form, '\t');
}
@@ -614,14 +614,14 @@ fh_error (format_data_t form, int argc, char *argv[])
}
void
-fh_progname (format_data_t form, int argc _GL_UNUSED_PARAMETER,
- char *argv[] _GL_UNUSED_PARAMETER)
+fh_progname (format_data_t form, int argc MAYBE_UNUSED,
+ char *argv[] MAYBE_UNUSED)
{
put_string (form, program_name);
}
void
-fh_exit (format_data_t form _GL_UNUSED_PARAMETER,
+fh_exit (format_data_t form MAYBE_UNUSED,
int argc, char *argv[])
{
int err = 0;
@@ -633,8 +633,8 @@ fh_exit (format_data_t form _GL_UNUSED_PARAMETER,
}
void
-fh_name (format_data_t form, int argc _GL_UNUSED_PARAMETER,
- char *argv[] _GL_UNUSED_PARAMETER)
+fh_name (format_data_t form, int argc MAYBE_UNUSED,
+ char *argv[] MAYBE_UNUSED)
{
put_string (form, form->name);
}
@@ -646,8 +646,8 @@ fh_index_query (format_data_t form, int argc, char *argv[])
}
void
-fh_index (format_data_t form, int argc _GL_UNUSED_PARAMETER,
- char *argv[] _GL_UNUSED_PARAMETER)
+fh_index (format_data_t form, int argc MAYBE_UNUSED,
+ char *argv[] MAYBE_UNUSED)
{
int indx = if_nametoindex (form->name);
@@ -930,8 +930,8 @@ fh_media_query (format_data_t form, int argc, char *argv[])
}
void
-fh_media (format_data_t form, int argc _GL_UNUSED_PARAMETER,
- char *argv[] _GL_UNUSED_PARAMETER)
+fh_media (format_data_t form, int argc MAYBE_UNUSED,
+ char *argv[] MAYBE_UNUSED)
{
/* Must be overridden by a system dependent implementation. */
put_string (form, "(not known)");
@@ -947,8 +947,8 @@ fh_status_query (format_data_t form, int argc, char *argv[])
}
void
-fh_status (format_data_t form, int argc _GL_UNUSED_PARAMETER,
- char *argv[] _GL_UNUSED_PARAMETER)
+fh_status (format_data_t form, int argc MAYBE_UNUSED,
+ char *argv[] MAYBE_UNUSED)
{
/* Must be overridden by a system dependent implementation. */
put_string (form, "(not known)");
diff --git a/ifconfig/system/bsd.c b/ifconfig/system/bsd.c
index d69a14a..21a9129 100644
--- a/ifconfig/system/bsd.c
+++ b/ifconfig/system/bsd.c
@@ -34,7 +34,7 @@
#include <netinet/if_ether.h>
#include <ifaddrs.h>
-#include <unused-parameter.h>
+#include <attribute.h>
/* Output format stuff. */
@@ -51,9 +51,9 @@ NAME [ADDR [DSTADDR]] [broadcast BRDADDR] [netmask MASK] "
struct argp_child system_argp_child;
int
-system_parse_opt (struct ifconfig **ifp _GL_UNUSED_PARAMETER,
- char option _GL_UNUSED_PARAMETER,
- char *optarg _GL_UNUSED_PARAMETER)
+system_parse_opt (struct ifconfig **ifp MAYBE_UNUSED,
+ char option MAYBE_UNUSED,
+ char *optarg MAYBE_UNUSED)
{
return 0;
}
@@ -180,9 +180,9 @@ system_parse_opt_rest (struct ifconfig **ifp, int argc,
char *argv[])
}
int
-system_configure (int sfd _GL_UNUSED_PARAMETER,
- struct ifreq *ifr _GL_UNUSED_PARAMETER,
- struct system_ifconfig *ifs _GL_UNUSED_PARAMETER)
+system_configure (int sfd MAYBE_UNUSED,
+ struct ifreq *ifr MAYBE_UNUSED,
+ struct system_ifconfig *ifs MAYBE_UNUSED)
{
return 0;
}
@@ -370,8 +370,8 @@ system_fh_hwaddr_query (format_data_t form, int argc, char
*argv[])
}
void
-system_fh_hwaddr (format_data_t form, int argc _GL_UNUSED_PARAMETER,
- char *argv[] _GL_UNUSED_PARAMETER)
+system_fh_hwaddr (format_data_t form, int argc MAYBE_UNUSED,
+ char *argv[] MAYBE_UNUSED)
{
ESTABLISH_IFADDRS
if (!ifp)
@@ -441,8 +441,8 @@ system_fh_hwtype_query (format_data_t form, int argc, char
*argv[])
}
void
-system_fh_hwtype (format_data_t form, int argc _GL_UNUSED_PARAMETER,
- char *argv[] _GL_UNUSED_PARAMETER)
+system_fh_hwtype (format_data_t form, int argc MAYBE_UNUSED,
+ char *argv[] MAYBE_UNUSED)
{
int found = 0;
@@ -530,8 +530,8 @@ system_fh_media_query (format_data_t form, int argc, char
*argv[])
}
void
-system_fh_media (format_data_t form, int argc _GL_UNUSED_PARAMETER,
- char *argv[] _GL_UNUSED_PARAMETER)
+system_fh_media (format_data_t form, int argc MAYBE_UNUSED,
+ char *argv[] MAYBE_UNUSED)
{
#ifdef SIOCGIFMEDIA
memset (&ifm, 0, sizeof (ifm));
diff --git a/ifconfig/system/generic.c b/ifconfig/system/generic.c
index d6db42a..47bdb43 100644
--- a/ifconfig/system/generic.c
+++ b/ifconfig/system/generic.c
@@ -24,7 +24,7 @@
#include "../ifconfig.h"
-#include <unused-parameter.h>
+#include <attribute.h>
/* Output format stuff. */
@@ -39,25 +39,25 @@ const char *system_help;
struct argp_child system_argp_child;
int
-system_parse_opt (struct ifconfig **ifp _GL_UNUSED_PARAMETER,
- char option _GL_UNUSED_PARAMETER,
- char *optarg _GL_UNUSED_PARAMETER)
+system_parse_opt (struct ifconfig **ifp MAYBE_UNUSED,
+ char option MAYBE_UNUSED,
+ char *optarg MAYBE_UNUSED)
{
return 0;
}
int
-system_parse_opt_rest (struct ifconfig **ifp _GL_UNUSED_PARAMETER,
- int argc _GL_UNUSED_PARAMETER,
- char *argv[] _GL_UNUSED_PARAMETER)
+system_parse_opt_rest (struct ifconfig **ifp MAYBE_UNUSED,
+ int argc MAYBE_UNUSED,
+ char *argv[] MAYBE_UNUSED)
{
return 0;
}
int
-system_configure (int sfd _GL_UNUSED_PARAMETER,
- struct ifreq *ifr _GL_UNUSED_PARAMETER,
- struct system_ifconfig *ifs _GL_UNUSED_PARAMETER)
+system_configure (int sfd MAYBE_UNUSED,
+ struct ifreq *ifr MAYBE_UNUSED,
+ struct system_ifconfig *ifs MAYBE_UNUSED)
{
return 0;
}
diff --git a/ifconfig/system/hurd.c b/ifconfig/system/hurd.c
index 590cb13..ff85d72 100644
--- a/ifconfig/system/hurd.c
+++ b/ifconfig/system/hurd.c
@@ -27,7 +27,7 @@
#include <net/if_arp.h>
#include "../ifconfig.h"
-#include <unused-parameter.h>
+#include <attribute.h>
/* Output format stuff. */
@@ -44,9 +44,9 @@ const char *system_help = "NAME [ADDR]\
struct argp_child system_argp_child;
int
-system_parse_opt (struct ifconfig **ifp _GL_UNUSED_PARAMETER,
- char option _GL_UNUSED_PARAMETER,
- char *optarg _GL_UNUSED_PARAMETER)
+system_parse_opt (struct ifconfig **ifp MAYBE_UNUSED,
+ char option MAYBE_UNUSED,
+ char *optarg MAYBE_UNUSED)
{
return 0;
}
@@ -158,9 +158,9 @@ system_parse_opt_rest (struct ifconfig **ifp, int argc,
char *argv[])
}
int
-system_configure (int sfd _GL_UNUSED_PARAMETER,
- struct ifreq *ifr _GL_UNUSED_PARAMETER,
- struct system_ifconfig *ifs _GL_UNUSED_PARAMETER)
+system_configure (int sfd MAYBE_UNUSED,
+ struct ifreq *ifr MAYBE_UNUSED,
+ struct system_ifconfig *ifs MAYBE_UNUSED)
{
return 0;
}
@@ -168,7 +168,7 @@ system_configure (int sfd _GL_UNUSED_PARAMETER,
struct if_nameindex* (*system_if_nameindex) (void) = if_nameindex;
static void
-print_hwaddr_ether (format_data_t form _GL_UNUSED_PARAMETER,
+print_hwaddr_ether (format_data_t form MAYBE_UNUSED,
unsigned char *data)
{
*column += printf ("%02X:%02X:%02X:%02X:%02X:%02X",
@@ -236,8 +236,8 @@ system_fh_hwaddr_query (format_data_t form, int argc, char
*argv[])
}
void
-system_fh_hwaddr (format_data_t form, int argc _GL_UNUSED_PARAMETER,
- char *argv[] _GL_UNUSED_PARAMETER)
+system_fh_hwaddr (format_data_t form, int argc MAYBE_UNUSED,
+ char *argv[] MAYBE_UNUSED)
{
#ifdef SIOCGIFHWADDR
if (ioctl (form->sfd, SIOCGIFHWADDR, form->ifr) < 0)
@@ -273,8 +273,8 @@ system_fh_hwtype_query (format_data_t form, int argc, char
*argv[])
}
void
-system_fh_hwtype (format_data_t form, int argc _GL_UNUSED_PARAMETER,
- char *argv[] _GL_UNUSED_PARAMETER)
+system_fh_hwtype (format_data_t form, int argc MAYBE_UNUSED,
+ char *argv[] MAYBE_UNUSED)
{
#ifdef SIOCGIFHWADDR
if (ioctl (form->sfd, SIOCGIFHWADDR, form->ifr) < 0)
diff --git a/ifconfig/system/linux.c b/ifconfig/system/linux.c
index e453b46..f1bbc06 100644
--- a/ifconfig/system/linux.c
+++ b/ifconfig/system/linux.c
@@ -48,7 +48,7 @@
#endif
#include <read-file.h>
-#include <unused-parameter.h>
+#include <attribute.h>
#include "../ifconfig.h"
@@ -56,7 +56,7 @@
/* ARPHRD stuff. */
static void
-print_hwaddr_ether (format_data_t form _GL_UNUSED_PARAMETER,
+print_hwaddr_ether (format_data_t form MAYBE_UNUSED,
unsigned char *data)
{
*column += printf ("%02X:%02X:%02X:%02X:%02X:%02X",
@@ -65,7 +65,7 @@ print_hwaddr_ether (format_data_t form _GL_UNUSED_PARAMETER,
}
static void
-print_hwaddr_arcnet (format_data_t form _GL_UNUSED_PARAMETER,
+print_hwaddr_arcnet (format_data_t form MAYBE_UNUSED,
unsigned char *data)
{
*column += printf ("%02X", data[0]);
@@ -73,7 +73,7 @@ print_hwaddr_arcnet (format_data_t form _GL_UNUSED_PARAMETER,
}
static void
-print_hwaddr_dlci (format_data_t form _GL_UNUSED_PARAMETER,
+print_hwaddr_dlci (format_data_t form MAYBE_UNUSED,
unsigned char *data)
{
*column += printf ("%i", *((short *) data));
@@ -99,7 +99,7 @@ print_hwaddr_ax25 (format_data_t form, unsigned char *data)
}
static void
-print_hwaddr_irda (format_data_t form _GL_UNUSED_PARAMETER,
+print_hwaddr_irda (format_data_t form MAYBE_UNUSED,
unsigned char *data)
{
*column += printf ("%02X:%02X:%02X:%02X",
@@ -108,7 +108,7 @@ print_hwaddr_irda (format_data_t form _GL_UNUSED_PARAMETER,
}
static void
-print_hwaddr_rose (format_data_t form _GL_UNUSED_PARAMETER,
+print_hwaddr_rose (format_data_t form MAYBE_UNUSED,
unsigned char *data)
{
*column += printf ("%02X%02X%02X%02X%02X",
@@ -552,8 +552,8 @@ system_fh_hwaddr_query (format_data_t form, int argc, char
*argv[])
}
void
-system_fh_hwaddr (format_data_t form, int argc _GL_UNUSED_PARAMETER,
- char *argv[] _GL_UNUSED_PARAMETER)
+system_fh_hwaddr (format_data_t form, int argc MAYBE_UNUSED,
+ char *argv[] MAYBE_UNUSED)
{
#ifdef SIOCGIFHWADDR
if (ioctl (form->sfd, SIOCGIFHWADDR, form->ifr) < 0)
@@ -589,8 +589,8 @@ system_fh_hwtype_query (format_data_t form, int argc, char
*argv[])
}
void
-system_fh_hwtype (format_data_t form, int argc _GL_UNUSED_PARAMETER,
- char *argv[] _GL_UNUSED_PARAMETER)
+system_fh_hwtype (format_data_t form, int argc MAYBE_UNUSED,
+ char *argv[] MAYBE_UNUSED)
{
#ifdef SIOCGIFHWADDR
if (ioctl (form->sfd, SIOCGIFHWADDR, form->ifr) < 0)
diff --git a/ifconfig/system/solaris.c b/ifconfig/system/solaris.c
index ad0e970..ccce464 100644
--- a/ifconfig/system/solaris.c
+++ b/ifconfig/system/solaris.c
@@ -46,7 +46,7 @@
#include <net/if_arp.h>
#include <netinet/if_ether.h>
-#include <unused-parameter.h>
+#include <attribute.h>
#include "../ifconfig.h"
@@ -65,9 +65,9 @@ NAME [ADDR [DSTADDR]] [broadcast BRDADDR] [netmask MASK] "
struct argp_child system_argp_child;
int
-system_parse_opt (struct ifconfig **ifp _GL_UNUSED_PARAMETER,
- char option _GL_UNUSED_PARAMETER,
- char *optarg _GL_UNUSED_PARAMETER)
+system_parse_opt (struct ifconfig **ifp MAYBE_UNUSED,
+ char option MAYBE_UNUSED,
+ char *optarg MAYBE_UNUSED)
{
return 0;
}
diff --git a/libinetutils/daemon.c b/libinetutils/daemon.c
index d8fe75b..4f5a1da 100644
--- a/libinetutils/daemon.c
+++ b/libinetutils/daemon.c
@@ -55,7 +55,7 @@
#include <stdlib.h>
#include <sys/types.h>
#include <sys/wait.h>
-#include <unused-parameter.h>
+#include <attribute.h>
/*
According to Unix-FAQ maintained by Andrew Gierth:
@@ -104,7 +104,7 @@
#define MAXFD 64
void
-waitdaemon_timeout (int signo _GL_UNUSED_PARAMETER)
+waitdaemon_timeout (int signo MAYBE_UNUSED)
{
int left;
diff --git a/libtelnet/auth.c b/libtelnet/auth.c
index 310d30d..eb4ae23 100644
--- a/libtelnet/auth.c
+++ b/libtelnet/auth.c
@@ -70,7 +70,7 @@
#include <config.h>
-#include "unused-parameter.h"
+#include "attribute.h"
#if defined AUTHENTICATION
# include <stdio.h>
@@ -665,7 +665,7 @@ auth_finished (TN_Authenticator * ap, int result)
}
static void
-auth_intr (int sig _GL_UNUSED_PARAMETER)
+auth_intr (int sig MAYBE_UNUSED)
{
auth_finished (0, AUTH_REJECT);
}
diff --git a/libtelnet/encrypt.c b/libtelnet/encrypt.c
index fdef43e..4973b00 100644
--- a/libtelnet/encrypt.c
+++ b/libtelnet/encrypt.c
@@ -82,7 +82,7 @@
# include <string.h>
# include <stdio.h>
-# include <unused-parameter.h>
+# include <attribute.h>
# include "genget.h"
/* String representation of our capabilities.
@@ -669,8 +669,8 @@ encrypt_reply (unsigned char *data, int cnt)
* Called when a ENCRYPT START command is received.
*/
void
-encrypt_start (unsigned char *data _GL_UNUSED_PARAMETER,
- int cnt _GL_UNUSED_PARAMETER)
+encrypt_start (unsigned char *data MAYBE_UNUSED,
+ int cnt MAYBE_UNUSED)
{
Encryptions *ep;
@@ -752,8 +752,8 @@ encrypt_request_end (void)
* can.
*/
void
-encrypt_request_start (unsigned char *data _GL_UNUSED_PARAMETER,
- int cnt _GL_UNUSED_PARAMETER)
+encrypt_request_start (unsigned char *data MAYBE_UNUSED,
+ int cnt MAYBE_UNUSED)
{
if (encrypt_mode == 0)
{
diff --git a/libtelnet/kerberos5.c b/libtelnet/kerberos5.c
index 19e4fb5..77d4023 100644
--- a/libtelnet/kerberos5.c
+++ b/libtelnet/kerberos5.c
@@ -37,7 +37,7 @@
# include <ctype.h>
# include <syslog.h>
# include <string.h>
-# include <unused-parameter.h>
+# include <attribute.h>
# include "auth.h"
# include "misc.h"
@@ -121,7 +121,7 @@ Data (TN_Authenticator * ap, int type, krb5_pointer d, int
c)
/* FIXME: Reverse return code! */
int
-kerberos5_init (TN_Authenticator * ap _GL_UNUSED_PARAMETER, int server)
+kerberos5_init (TN_Authenticator * ap MAYBE_UNUSED, int server)
{
str_data[3] = server ? TELQUAL_REPLY : TELQUAL_IS;
if (telnet_context == 0 && krb5_init_context (&telnet_context))
@@ -428,7 +428,7 @@ kerberos5_reply (TN_Authenticator * ap, unsigned char
*data, int cnt)
}
int
-kerberos5_status (TN_Authenticator * ap _GL_UNUSED_PARAMETER,
+kerberos5_status (TN_Authenticator * ap MAYBE_UNUSED,
char *name, size_t len, int level)
{
if (level < AUTH_USER)
diff --git a/libtelnet/shishi.c b/libtelnet/shishi.c
index deacb7e..a6bafbc 100644
--- a/libtelnet/shishi.c
+++ b/libtelnet/shishi.c
@@ -33,7 +33,7 @@
# include <ctype.h>
# include <syslog.h>
# include <string.h>
-# include <unused-parameter.h>
+# include <attribute.h>
# include "auth.h"
# include "misc.h"
@@ -102,7 +102,7 @@ Shishi *shishi_telnet = NULL;
/* FIXME: Reverse return code! */
int
-krb5shishi_init (TN_Authenticator * ap _GL_UNUSED_PARAMETER,
+krb5shishi_init (TN_Authenticator * ap MAYBE_UNUSED,
int server)
{
if (server)
@@ -137,7 +137,7 @@ delayed_shishi_init (void)
}
void
-krb5shishi_cleanup (TN_Authenticator * ap _GL_UNUSED_PARAMETER)
+krb5shishi_cleanup (TN_Authenticator * ap MAYBE_UNUSED)
{
if (shishi_handle == NULL)
return;
@@ -396,7 +396,7 @@ krb5shishi_reply (TN_Authenticator * ap, unsigned char
*data, int cnt)
}
int
-krb5shishi_status (TN_Authenticator * ap _GL_UNUSED_PARAMETER,
+krb5shishi_status (TN_Authenticator * ap MAYBE_UNUSED,
char *name, size_t len, int level)
{
int status;
diff --git a/ping/ping.c b/ping/ping.c
index 149df74..49ee2a4 100644
--- a/ping/ping.c
+++ b/ping/ping.c
@@ -48,7 +48,7 @@
#endif
#include <argp.h>
-#include <unused-parameter.h>
+#include <attribute.h>
#include <ping.h>
#include "ping_impl.h"
#include "libinetutils.h"
@@ -377,7 +377,7 @@ decode_ip_timestamp (char *arg)
int volatile stop = 0;
void
-sig_int (int signal _GL_UNUSED_PARAMETER)
+sig_int (int signal MAYBE_UNUSED)
{
stop = 1;
}
diff --git a/ping/ping6.c b/ping/ping6.c
index ffa85b3..8d97541 100644
--- a/ping/ping6.c
+++ b/ping/ping6.c
@@ -52,7 +52,7 @@
# include <idna.h>
#endif
-#include <unused-parameter.h>
+#include <attribute.h>
#include <xalloc.h>
#include "ping6.h"
#include "libinetutils.h"
@@ -310,7 +310,7 @@ main (int argc, char **argv)
static volatile int stop = 0;
static void
-sig_int (int signal _GL_UNUSED_PARAMETER)
+sig_int (int signal MAYBE_UNUSED)
{
stop = 1;
}
@@ -546,7 +546,7 @@ ping_reset (PING * p)
static int
print_echo (int dupflag, int hops, struct ping_stat *ping_stat,
- struct sockaddr_in6 *dest _GL_UNUSED_PARAMETER,
+ struct sockaddr_in6 *dest MAYBE_UNUSED,
struct sockaddr_in6 *from,
struct icmp6_hdr *icmp6, int datalen)
{
@@ -823,7 +823,7 @@ echo_finish (void)
}
static PING *
-ping_init (int type _GL_UNUSED_PARAMETER, int ident)
+ping_init (int type MAYBE_UNUSED, int ident)
{
int fd, err;
const int on = 1;
diff --git a/ping/ping_address.c b/ping/ping_address.c
index 7163ddd..7817c98 100644
--- a/ping/ping_address.c
+++ b/ping/ping_address.c
@@ -41,7 +41,7 @@
#include <stdio.h>
#include <ctype.h>
#include <errno.h>
-#include <unused-parameter.h>
+#include <attribute.h>
#include <ping.h>
#include <ping_impl.h>
@@ -91,10 +91,10 @@ recv_address (int code, void *closure,
}
void
-print_address (int dupflag, void *closure _GL_UNUSED_PARAMETER,
- struct sockaddr_in *dest _GL_UNUSED_PARAMETER,
+print_address (int dupflag, void *closure MAYBE_UNUSED,
+ struct sockaddr_in *dest MAYBE_UNUSED,
struct sockaddr_in *from,
- struct ip *ip _GL_UNUSED_PARAMETER,
+ struct ip *ip MAYBE_UNUSED,
icmphdr_t * icmp, int datalen)
{
struct in_addr addr;
diff --git a/ping/ping_common.c b/ping/ping_common.c
index ce07451..2fcae92 100644
--- a/ping/ping_common.c
+++ b/ping/ping_common.c
@@ -31,7 +31,7 @@
#include <arpa/inet.h>
#include <netdb.h>
#include <xalloc.h>
-#include <unused-parameter.h>
+#include <attribute.h>
#include "ping_common.h"
diff --git a/ping/ping_echo.c b/ping/ping_echo.c
index 2976830..3ab116f 100644
--- a/ping/ping_echo.c
+++ b/ping/ping_echo.c
@@ -41,7 +41,7 @@
#include <ctype.h>
#include <errno.h>
#include <limits.h>
-#include <unused-parameter.h>
+#include <attribute.h>
#include <ping.h>
#include "ping_impl.h"
@@ -174,7 +174,7 @@ handler (int code, void *closure,
int
print_echo (int dupflag, struct ping_stat *ping_stat,
- struct sockaddr_in *dest _GL_UNUSED_PARAMETER,
+ struct sockaddr_in *dest MAYBE_UNUSED,
struct sockaddr_in *from,
struct ip *ip, icmphdr_t * icmp, int datalen)
{
@@ -339,7 +339,7 @@ print_ip_header (struct ip *ip)
}
void
-print_ip_data (icmphdr_t * icmp, void *data _GL_UNUSED_PARAMETER)
+print_ip_data (icmphdr_t * icmp, void *data MAYBE_UNUSED)
{
int hlen;
unsigned char *cp;
diff --git a/ping/ping_router.c b/ping/ping_router.c
index 0a6d48d..125d8d3 100644
--- a/ping/ping_router.c
+++ b/ping/ping_router.c
@@ -40,13 +40,13 @@
#include <stdio.h>
#include <ctype.h>
#include <errno.h>
-#include <unused-parameter.h>
+#include <attribute.h>
#include <ping.h>
#include <ping_impl.h>
int
-ping_router (char *hostname _GL_UNUSED_PARAMETER)
+ping_router (char *hostname MAYBE_UNUSED)
{
return 0;
}
diff --git a/ping/ping_timestamp.c b/ping/ping_timestamp.c
index b32c36f..17f51d1 100644
--- a/ping/ping_timestamp.c
+++ b/ping/ping_timestamp.c
@@ -40,7 +40,7 @@
#include <stdio.h>
#include <ctype.h>
#include <errno.h>
-#include <unused-parameter.h>
+#include <attribute.h>
#include <ping.h>
#include <ping_impl.h>
@@ -91,10 +91,10 @@ recv_timestamp (int code, void *closure,
void
-print_timestamp (int dupflag, void *closure _GL_UNUSED_PARAMETER,
- struct sockaddr_in *dest _GL_UNUSED_PARAMETER,
+print_timestamp (int dupflag, void *closure MAYBE_UNUSED,
+ struct sockaddr_in *dest MAYBE_UNUSED,
struct sockaddr_in *from,
- struct ip *ip _GL_UNUSED_PARAMETER,
+ struct ip *ip MAYBE_UNUSED,
icmphdr_t * icmp, int datalen)
{
char timestr[16];
diff --git a/src/inetd.c b/src/inetd.c
index d3d8281..04d3361 100644
--- a/src/inetd.c
+++ b/src/inetd.c
@@ -137,7 +137,7 @@
#include "libinetutils.h"
#include "argcv.h"
#include "version-etc.h"
-#include "unused-parameter.h"
+#include "attribute.h"
#ifndef EAI_ADDRFAMILY
# define EAI_ADDRFAMILY 1
@@ -203,7 +203,7 @@ static struct argp_option argp_options[] = {
static error_t
parse_opt (int key, char *arg,
- struct argp_state *state _GL_UNUSED_PARAMETER)
+ struct argp_state *state MAYBE_UNUSED)
{
char *p;
int number;
@@ -490,7 +490,7 @@ run_service (int ctrl, struct servtab *sep)
}
void
-reapchild (int signo _GL_UNUSED_PARAMETER)
+reapchild (int signo MAYBE_UNUSED)
{
int status;
pid_t pid;
@@ -692,7 +692,7 @@ servent_setup (struct servtab *sep)
}
void
-retry (int signo _GL_UNUSED_PARAMETER)
+retry (int signo MAYBE_UNUSED)
{
struct servtab *sep;
@@ -1525,7 +1525,7 @@ echo_stream (int s, struct servtab *sep)
/* Echo service -- echo data back */
void
-echo_dg (int s, struct servtab *sep _GL_UNUSED_PARAMETER)
+echo_dg (int s, struct servtab *sep MAYBE_UNUSED)
{
char buffer[BUFSIZE];
int i;
@@ -1563,7 +1563,7 @@ discard_stream (int s, struct servtab *sep)
void
/* Discard service -- ignore data */
-discard_dg (int s, struct servtab *sep _GL_UNUSED_PARAMETER)
+discard_dg (int s, struct servtab *sep MAYBE_UNUSED)
{
char buffer[BUFSIZE];
@@ -1624,7 +1624,7 @@ chargen_stream (int s, struct servtab *sep)
/* Character generator */
void
-chargen_dg (int s, struct servtab *sep _GL_UNUSED_PARAMETER)
+chargen_dg (int s, struct servtab *sep MAYBE_UNUSED)
{
#ifdef IPV6
struct sockaddr_storage sa;
@@ -1686,7 +1686,7 @@ machtime (void)
}
void
-machtime_stream (int s, struct servtab *sep _GL_UNUSED_PARAMETER)
+machtime_stream (int s, struct servtab *sep MAYBE_UNUSED)
{
long result;
@@ -1695,7 +1695,7 @@ machtime_stream (int s, struct servtab *sep
_GL_UNUSED_PARAMETER)
}
void
-machtime_dg (int s, struct servtab *sep _GL_UNUSED_PARAMETER)
+machtime_dg (int s, struct servtab *sep MAYBE_UNUSED)
{
long result;
#ifdef IPV6
@@ -1716,7 +1716,7 @@ machtime_dg (int s, struct servtab *sep
_GL_UNUSED_PARAMETER)
void
/* Return human-readable time of day */
-daytime_stream (int s, struct servtab *sep _GL_UNUSED_PARAMETER)
+daytime_stream (int s, struct servtab *sep MAYBE_UNUSED)
{
char buffer[256];
time_t lclock;
@@ -1729,7 +1729,7 @@ daytime_stream (int s, struct servtab *sep
_GL_UNUSED_PARAMETER)
/* Return human-readable time of day */
void
-daytime_dg (int s, struct servtab *sep _GL_UNUSED_PARAMETER)
+daytime_dg (int s, struct servtab *sep MAYBE_UNUSED)
{
char buffer[256];
time_t lclock;
diff --git a/src/logger.c b/src/logger.c
index 1228a1e..25b6e2b 100644
--- a/src/logger.c
+++ b/src/logger.c
@@ -41,7 +41,7 @@
#include <error.h>
#include <xalloc.h>
#include <inttostr.h>
-#include <unused-parameter.h>
+#include <attribute.h>
#define SYSLOG_NAMES
#include <syslog.h>
@@ -374,7 +374,7 @@ static struct argp_option argp_options[] = {
};
static error_t
-parse_opt (int key, char *arg, struct argp_state *state _GL_UNUSED_PARAMETER)
+parse_opt (int key, char *arg, struct argp_state *state MAYBE_UNUSED)
{
switch (key)
{
diff --git a/src/rcp.c b/src/rcp.c
index 476cbaa..743930c 100644
--- a/src/rcp.c
+++ b/src/rcp.c
@@ -84,7 +84,7 @@
# include <utime.h> /* If we don't have utimes(), use utime(). */
#endif
#include <progname.h>
-#include <unused-parameter.h>
+#include <attribute.h>
#include <libinetutils.h>
#include <argp.h>
#include <error.h>
@@ -202,7 +202,7 @@ static struct argp_option options[] = {
};
static error_t
-parse_opt (int key, char *arg, struct argp_state *state _GL_UNUSED_PARAMETER)
+parse_opt (int key, char *arg, struct argp_state *state MAYBE_UNUSED)
{
switch (key)
{
@@ -1489,7 +1489,7 @@ allocbuf (BUF * bp, int fd, int blksize)
}
void
-lostconn (int signo _GL_UNUSED_PARAMETER)
+lostconn (int signo MAYBE_UNUSED)
{
if (!iamremote)
error (0, 0, "lost connection");
diff --git a/src/rexecd.c b/src/rexecd.c
index f3c5092..4777a6d 100644
--- a/src/rexecd.c
+++ b/src/rexecd.c
@@ -112,7 +112,7 @@
#include <progname.h>
#include <argp.h>
#include <error.h>
-#include <unused-parameter.h>
+#include <attribute.h>
#include "libinetutils.h"
void die (int code, const char *fmt, ...);
@@ -137,8 +137,8 @@ static struct argp_option options[] = {
};
static error_t
-parse_opt (int key, char *arg _GL_UNUSED_PARAMETER,
- struct argp_state *state _GL_UNUSED_PARAMETER)
+parse_opt (int key, char *arg MAYBE_UNUSED,
+ struct argp_state *state MAYBE_UNUSED)
{
switch (key)
{
@@ -730,7 +730,7 @@ getstr (const char *err)
static int
rexec_conv (int num, const struct pam_message **pam_msg,
struct pam_response **pam_resp,
- void *data _GL_UNUSED_PARAMETER)
+ void *data MAYBE_UNUSED)
{
struct pam_response *resp;
diff --git a/src/rlogin.c b/src/rlogin.c
index bdfcfa6..2abb2d2 100644
--- a/src/rlogin.c
+++ b/src/rlogin.c
@@ -103,7 +103,7 @@
#include <progname.h>
#include "libinetutils.h"
-#include "unused-parameter.h"
+#include "attribute.h"
#include "xalloc.h"
#ifdef KERBEROS
@@ -927,7 +927,7 @@ int dosigwinch;
* FIXME: Race condition due to sendwindow() in signal handler?
*/
void
-writeroob (int signo _GL_UNUSED_PARAMETER)
+writeroob (int signo MAYBE_UNUSED)
{
if (dosigwinch == 0)
{
@@ -946,7 +946,7 @@ writeroob (int signo _GL_UNUSED_PARAMETER)
/* FIXME: System dependent race condition due to done().
*/
void
-catch_child (int signo _GL_UNUSED_PARAMETER)
+catch_child (int signo MAYBE_UNUSED)
{
int status;
pid_t pid;
@@ -1113,7 +1113,7 @@ stop (char cmdc)
}
void
-sigwinch (int signo _GL_UNUSED_PARAMETER)
+sigwinch (int signo MAYBE_UNUSED)
{
struct winsize ws;
@@ -1172,7 +1172,7 @@ int rcvcnt, rcvstate;
char rcvbuf[8 * 1024];
void
-oob (int signo _GL_UNUSED_PARAMETER)
+oob (int signo MAYBE_UNUSED)
{
char mark;
struct termios tt;
diff --git a/src/rlogind.c b/src/rlogind.c
index 345b9b6..3be3b45 100644
--- a/src/rlogind.c
+++ b/src/rlogind.c
@@ -117,7 +117,7 @@
#include <progname.h>
#include <argp.h>
#include <libinetutils.h>
-#include "unused-parameter.h"
+#include "attribute.h"
#include "xalloc.h"
/*
@@ -309,7 +309,7 @@ void prevent_routing (int fd, struct auth_data *ap);
#endif
void
-rlogind_sigchld (int signo _GL_UNUSED_PARAMETER)
+rlogind_sigchld (int signo MAYBE_UNUSED)
{
pid_t pid;
int status;
@@ -488,7 +488,7 @@ static struct argp_option options[] = {
static error_t
parse_opt (int key, char *arg,
- struct argp_state *state _GL_UNUSED_PARAMETER)
+ struct argp_state *state MAYBE_UNUSED)
{
switch (key)
{
@@ -2230,7 +2230,7 @@ do_pam_check (int infd, struct auth_data *ap, const char
*service)
static int
rlogin_conv (int num, const struct pam_message **pam_msg,
struct pam_response **pam_resp,
- void *data _GL_UNUSED_PARAMETER)
+ void *data MAYBE_UNUSED)
{
struct pam_response *resp;
diff --git a/src/rsh.c b/src/rsh.c
index fa97e2a..79bfbc2 100644
--- a/src/rsh.c
+++ b/src/rsh.c
@@ -78,7 +78,7 @@
#include <xalloc.h>
#include <argp.h>
#include <libinetutils.h>
-#include <unused-parameter.h>
+#include <attribute.h>
#ifdef KRB5
# ifdef HAVE_KRB5_H
@@ -173,7 +173,7 @@ static struct argp_option options[] = {
static error_t
parse_opt (int key, char *arg,
- struct argp_state *state _GL_UNUSED_PARAMETER)
+ struct argp_state *state MAYBE_UNUSED)
{
switch (key)
{
@@ -784,7 +784,7 @@ sendsig (int sig)
}
void
-sigpipe (int sig _GL_UNUSED_PARAMETER)
+sigpipe (int sig MAYBE_UNUSED)
{
++end_of_pipe;
}
diff --git a/src/rshd.c b/src/rshd.c
index fed6f39..e83fbab 100644
--- a/src/rshd.c
+++ b/src/rshd.c
@@ -146,7 +146,7 @@
#include <error.h>
#include <progname.h>
#include <argp.h>
-#include <unused-parameter.h>
+#include <attribute.h>
#include <libinetutils.h>
#include "xalloc.h"
@@ -271,7 +271,7 @@ extern int iruserok (uint32_t raddr, int superuser,
#endif /* WITH_PAM */
static error_t
-parse_opt (int key, char *arg, struct argp_state *state _GL_UNUSED_PARAMETER)
+parse_opt (int key, char *arg, struct argp_state *state MAYBE_UNUSED)
{
switch (key)
{
@@ -2093,7 +2093,7 @@ topdomain (const char *h)
static int
rsh_conv (int num, const struct pam_message **pam_msg,
struct pam_response **pam_resp,
- void *data _GL_UNUSED_PARAMETER)
+ void *data MAYBE_UNUSED)
{
struct pam_response *resp;
diff --git a/src/syslogd.c b/src/syslogd.c
index 4528d7e..fb71e4c 100644
--- a/src/syslogd.c
+++ b/src/syslogd.c
@@ -137,7 +137,7 @@
#include <progname.h>
#include <libinetutils.h>
#include <readutmp.h> /* May define UTMP_NAME_FUNCTION. */
-#include "unused-parameter.h"
+#include "attribute.h"
#include "xalloc.h"
/* A mask of all facilities mentioned explicitly in the configuration file
@@ -1744,7 +1744,7 @@ cvthname (struct sockaddr *f, socklen_t len)
}
void
-domark (int signo _GL_UNUSED_PARAMETER)
+domark (int signo MAYBE_UNUSED)
{
struct filed *f;
@@ -1793,7 +1793,7 @@ logerror (const char *type)
}
void
-doexit (int signo _GL_UNUSED_PARAMETER)
+doexit (int signo MAYBE_UNUSED)
{
_exit (EXIT_SUCCESS);
}
@@ -2090,7 +2090,7 @@ load_confdir (const char *dirname, struct filed **nextp)
/* INIT -- Initialize syslogd from configuration table. */
void
-init (int signo _GL_UNUSED_PARAMETER)
+init (int signo MAYBE_UNUSED)
{
int rc, ret;
struct filed *f, *next, **nextp;
@@ -2487,7 +2487,7 @@ decode (const char *name, CODE * codetab)
}
void
-dbg_toggle (int signo _GL_UNUSED_PARAMETER)
+dbg_toggle (int signo MAYBE_UNUSED)
{
int dbg_save = dbg_output;
@@ -2523,7 +2523,7 @@ dbg_printf (const char *fmt, ...)
set a flag variable which will tell the main loop to go through a
restart. */
void
-trigger_restart (int signo _GL_UNUSED_PARAMETER)
+trigger_restart (int signo MAYBE_UNUSED)
{
restart = 1;
#ifndef HAVE_SIGACTION
diff --git a/src/tftp.c b/src/tftp.c
index 1143e74..75ef663 100644
--- a/src/tftp.c
+++ b/src/tftp.c
@@ -83,7 +83,7 @@
#endif
#include <argp.h>
-#include <unused-parameter.h>
+#include <attribute.h>
#include <libinetutils.h>
@@ -516,13 +516,13 @@ modecmd (int argc, char *argv[])
}
void
-setbinary (int argc _GL_UNUSED_PARAMETER, char *argv[] _GL_UNUSED_PARAMETER)
+setbinary (int argc MAYBE_UNUSED, char *argv[] MAYBE_UNUSED)
{
settftpmode ("octet");
}
void
-setascii (int argc _GL_UNUSED_PARAMETER, char *argv[] _GL_UNUSED_PARAMETER)
+setascii (int argc MAYBE_UNUSED, char *argv[] MAYBE_UNUSED)
{
settftpmode ("netascii");
}
@@ -792,7 +792,7 @@ settimeout (int argc, char *argv[])
}
void
-status (int argc _GL_UNUSED_PARAMETER, char *argv[] _GL_UNUSED_PARAMETER)
+status (int argc MAYBE_UNUSED, char *argv[] MAYBE_UNUSED)
{
if (connected)
printf ("Connected to %s.\n", hostname);
@@ -805,7 +805,7 @@ status (int argc _GL_UNUSED_PARAMETER, char *argv[]
_GL_UNUSED_PARAMETER)
}
void
-intr (int signo _GL_UNUSED_PARAMETER)
+intr (int signo MAYBE_UNUSED)
{
signal (SIGALRM, SIG_IGN);
alarm (0);
@@ -929,7 +929,7 @@ makeargv (void)
}
void
-quit (int argc _GL_UNUSED_PARAMETER, char *argv[] _GL_UNUSED_PARAMETER)
+quit (int argc MAYBE_UNUSED, char *argv[] MAYBE_UNUSED)
{
exit (EXIT_SUCCESS);
}
@@ -966,14 +966,14 @@ help (int argc, char *argv[])
}
void
-settrace (int argc _GL_UNUSED_PARAMETER, char *argv[] _GL_UNUSED_PARAMETER)
+settrace (int argc MAYBE_UNUSED, char *argv[] MAYBE_UNUSED)
{
trace = !trace;
printf ("Packet tracing %s.\n", trace ? "on" : "off");
}
void
-setverbose (int argc _GL_UNUSED_PARAMETER, char *argv[] _GL_UNUSED_PARAMETER)
+setverbose (int argc MAYBE_UNUSED, char *argv[] MAYBE_UNUSED)
{
verbose = !verbose;
printf ("Verbose mode %s.\n", verbose ? "on" : "off");
@@ -1378,7 +1378,7 @@ printstats (const char *direction, unsigned long amount)
}
static void
-timer (int sig _GL_UNUSED_PARAMETER)
+timer (int sig MAYBE_UNUSED)
{
timeout += rexmtval;
if (timeout >= maxtimeout)
diff --git a/src/tftpd.c b/src/tftpd.c
index cc1b703..8906591 100644
--- a/src/tftpd.c
+++ b/src/tftpd.c
@@ -85,7 +85,7 @@
#include "tftpsubs.h"
-#include <unused-parameter.h>
+#include <attribute.h>
#include <xalloc.h>
#include <argp.h>
#include <progname.h>
@@ -165,7 +165,7 @@ static struct argp_option options[] = {
static error_t
parse_opt (int key, char *arg,
- struct argp_state *state _GL_UNUSED_PARAMETER)
+ struct argp_state *state MAYBE_UNUSED)
{
switch (key)
{
@@ -636,7 +636,7 @@ int timeout;
sigjmp_buf timeoutbuf;
void
-timer (int sig _GL_UNUSED_PARAMETER)
+timer (int sig MAYBE_UNUSED)
{
timeout += rexmtval;
@@ -716,7 +716,7 @@ abort:
}
void
-justquit (int sig _GL_UNUSED_PARAMETER)
+justquit (int sig MAYBE_UNUSED)
{
exit (EXIT_SUCCESS);
}
diff --git a/src/traceroute.c b/src/traceroute.c
index de7db4b..c9620d6 100644
--- a/src/traceroute.c
+++ b/src/traceroute.c
@@ -49,7 +49,7 @@
#include <limits.h>
#include <assert.h>
#include <argp.h>
-#include <unused-parameter.h>
+#include <attribute.h>
#include <icmp.h>
#ifdef HAVE_LOCALE_H
# include <locale.h>
@@ -354,7 +354,7 @@ main (int argc, char **argv)
void
do_try (trace_t * trace, const int hop,
- const int max_hops _GL_UNUSED_PARAMETER,
+ const int max_hops MAYBE_UNUSED,
const int max_tries)
{
fd_set readset;
diff --git a/src/uucpd.c b/src/uucpd.c
index c8bb460..072c222 100644
--- a/src/uucpd.c
+++ b/src/uucpd.c
@@ -88,7 +88,7 @@
#include <argp.h>
#include <progname.h>
-#include <unused-parameter.h>
+#include <attribute.h>
#include <libinetutils.h>
void dologin (struct passwd *pw, struct sockaddr *sap, socklen_t salen);
@@ -119,7 +119,7 @@ static struct argp_option argp_options[] = {
static error_t
parse_opt (int key, char *arg,
- struct argp_state *state _GL_UNUSED_PARAMETER)
+ struct argp_state *state MAYBE_UNUSED)
{
switch (key)
{
diff --git a/talk/init_disp.c b/talk/init_disp.c
index 99e6b60..d5e0c25 100644
--- a/talk/init_disp.c
+++ b/talk/init_disp.c
@@ -62,10 +62,10 @@
#include <signal.h>
#include <error.h>
#include "talk.h"
-#include "unused-parameter.h"
+#include "attribute.h"
static void
-sig_sent (int sig _GL_UNUSED_PARAMETER)
+sig_sent (int sig MAYBE_UNUSED)
{
message ("Connection closing. Exiting");
diff --git a/talk/invite.c b/talk/invite.c
index 84b1976..ce1d083 100644
--- a/talk/invite.c
+++ b/talk/invite.c
@@ -62,7 +62,7 @@
#include <errno.h>
#include <unistd.h>
#include <setjmp.h>
-#include <unused-parameter.h>
+#include <attribute.h>
#include "talk_ctl.h"
#include "talk.h"
@@ -117,7 +117,7 @@ announce_invite (void)
* Routine called on interupt to re-invite the callee
*/
void
-re_invite (int sig _GL_UNUSED_PARAMETER)
+re_invite (int sig MAYBE_UNUSED)
{
message ("Ringing your party again");
diff --git a/talk/msgs.c b/talk/msgs.c
index d555e21..8c01b54 100644
--- a/talk/msgs.c
+++ b/talk/msgs.c
@@ -59,7 +59,7 @@
#include <time.h>
#include <signal.h>
#include <stdio.h>
-#include <unused-parameter.h>
+#include <attribute.h>
#include "talk.h"
#define MSG_INTERVAL 4
@@ -68,7 +68,7 @@ char *current_state;
int current_line = 0;
static void
-disp_msg (int sig _GL_UNUSED_PARAMETER)
+disp_msg (int sig MAYBE_UNUSED)
{
message (current_state);
}
diff --git a/talkd/table.c b/talkd/table.c
index 76b1137..ffe0306 100644
--- a/talkd/table.c
+++ b/talkd/table.c
@@ -21,7 +21,7 @@
#include <config.h>
#include <intalkd.h>
-#include "unused-parameter.h"
+#include "attribute.h"
typedef struct request_table table_t;
@@ -93,7 +93,7 @@ lookup_request (CTL_MSG * request,
static int
fuzzy_comp (table_t * ptr, CTL_MSG * request,
- time_t * unused _GL_UNUSED_PARAMETER)
+ time_t * unused MAYBE_UNUSED)
{
if (ptr->request.type == LEAVE_INVITE
&& strcmp (request->l_name, ptr->request.r_name) == 0
diff --git a/talkd/talkd.c b/talkd/talkd.c
index 452d3f1..08e3a5b 100644
--- a/talkd/talkd.c
+++ b/talkd/talkd.c
@@ -24,7 +24,7 @@
#include <signal.h>
#include <libinetutils.h>
#include <progname.h>
-#include "unused-parameter.h"
+#include "attribute.h"
#ifndef LOG_FACILITY
# define LOG_FACILITY LOG_DAEMON
@@ -67,7 +67,7 @@ static struct argp_option argp_options[] = {
static error_t
parse_opt (int key, char *arg,
- struct argp_state *state _GL_UNUSED_PARAMETER)
+ struct argp_state *state MAYBE_UNUSED)
{
switch (key)
{
@@ -138,7 +138,7 @@ talkd_init (void)
time_t last_msg_time;
static void
-alarm_handler (int err _GL_UNUSED_PARAMETER)
+alarm_handler (int err MAYBE_UNUSED)
{
int oerrno = errno;
diff --git a/telnet/commands.c b/telnet/commands.c
index 5cc9b4d..26cedba 100644
--- a/telnet/commands.c
+++ b/telnet/commands.c
@@ -81,7 +81,7 @@
# include <idna.h>
#endif
-#include <unused-parameter.h>
+#include <attribute.h>
#include <libinetutils.h>
#include "general.h"
@@ -1567,7 +1567,7 @@ suspend (void)
#if !defined TN3270
int
-shell (int argc, char *argv[] _GL_UNUSED_PARAMETER)
+shell (int argc, char *argv[] MAYBE_UNUSED)
{
long oldrows, oldcols, newrows, newcols, err;
diff --git a/telnet/main.c b/telnet/main.c
index c790d6e..1a96d35 100644
--- a/telnet/main.c
+++ b/telnet/main.c
@@ -64,7 +64,7 @@
#include <progname.h>
#include <error.h>
#include <argp.h>
-#include <unused-parameter.h>
+#include <attribute.h>
#include <libinetutils.h>
#include <arpa/telnet.h>
@@ -201,7 +201,7 @@ static struct argp_option argp_options[] = {
};
static error_t
-parse_opt (int key, char *arg, struct argp_state *state _GL_UNUSED_PARAMETER)
+parse_opt (int key, char *arg, struct argp_state *state MAYBE_UNUSED)
{
switch (key)
{
diff --git a/telnet/sys_bsd.c b/telnet/sys_bsd.c
index 6a4b655..9dd2ec4 100644
--- a/telnet/sys_bsd.c
+++ b/telnet/sys_bsd.c
@@ -64,7 +64,7 @@
#include <errno.h>
#include <arpa/telnet.h>
#include <sys/select.h>
-#include <unused-parameter.h>
+#include <attribute.h>
#include "ring.h"
@@ -942,7 +942,7 @@ NetSetPgrp (int fd)
*/
void
-deadpeer (int sig _GL_UNUSED_PARAMETER)
+deadpeer (int sig MAYBE_UNUSED)
{
setcommandmode ();
longjmp (peerdied, -1);
@@ -950,7 +950,7 @@ deadpeer (int sig _GL_UNUSED_PARAMETER)
void
-intr (int sig _GL_UNUSED_PARAMETER)
+intr (int sig MAYBE_UNUSED)
{
if (localchars)
{
@@ -963,7 +963,7 @@ intr (int sig _GL_UNUSED_PARAMETER)
void
-intr2 (int sig _GL_UNUSED_PARAMETER)
+intr2 (int sig MAYBE_UNUSED)
{
if (localchars)
{
@@ -979,7 +979,7 @@ intr2 (int sig _GL_UNUSED_PARAMETER)
#ifdef SIGTSTP
void
-susp (int sig _GL_UNUSED_PARAMETER)
+susp (int sig MAYBE_UNUSED)
{
if ((rlogin != _POSIX_VDISABLE) && rlogin_susp ())
return;
@@ -990,7 +990,7 @@ susp (int sig _GL_UNUSED_PARAMETER)
#ifdef SIGWINCH
void
-sendwin (int sig _GL_UNUSED_PARAMETER)
+sendwin (int sig MAYBE_UNUSED)
{
if (connected)
{
@@ -1001,7 +1001,7 @@ sendwin (int sig _GL_UNUSED_PARAMETER)
#ifdef SIGINFO
void
-ayt (int sig _GL_UNUSED_PARAMETER)
+ayt (int sig MAYBE_UNUSED)
{
if (connected)
sendayt ();
diff --git a/telnetd/telnetd.c b/telnetd/telnetd.c
index c0d3ba0..db5d212 100644
--- a/telnetd/telnetd.c
+++ b/telnetd/telnetd.c
@@ -27,7 +27,7 @@
#include <argp.h>
#include <progname.h>
#include <error.h>
-#include <unused-parameter.h>
+#include <attribute.h>
#include <libinetutils.h>
#if defined AUTHENTICATION || defined ENCRYPTION
@@ -145,7 +145,7 @@ static struct argp_option argp_options[] = {
};
static error_t
-parse_opt (int key, char *arg, struct argp_state *state _GL_UNUSED_PARAMETER)
+parse_opt (int key, char *arg, struct argp_state *state MAYBE_UNUSED)
{
switch (key)
{
@@ -796,7 +796,7 @@ print_hostinfo (void)
}
static void
-chld_is_done (int sig _GL_UNUSED_PARAMETER)
+chld_is_done (int sig MAYBE_UNUSED)
{
pending_sigchld = 1;
}
diff --git a/tests/localhost.c b/tests/localhost.c
index 8b7a745..019b238 100644
--- a/tests/localhost.c
+++ b/tests/localhost.c
@@ -23,11 +23,11 @@
#include <stdio.h>
#include <stdlib.h>
-#include <unused-parameter.h>
+#include <attribute.h>
#include <progname.h>
int
-main (int argc _GL_UNUSED_PARAMETER, char **argv)
+main (int argc MAYBE_UNUSED, char **argv)
{
char *p = localhost ();
set_program_name (argv[0]);
diff --git a/tests/waitdaemon.c b/tests/waitdaemon.c
index 95bf2ee..66af6ca 100644
--- a/tests/waitdaemon.c
+++ b/tests/waitdaemon.c
@@ -34,18 +34,18 @@
#include <error.h>
#include <progname.h>
#include <libinetutils.h>
-#include <unused-parameter.h>
+#include <attribute.h>
extern int waitdaemon (int nochdir, int noclose, int maxwait);
void
-doexit (int signo _GL_UNUSED_PARAMETER)
+doexit (int signo MAYBE_UNUSED)
{
_exit (EXIT_SUCCESS);
}
int
-main (int argc _GL_UNUSED_PARAMETER, char *argv[])
+main (int argc MAYBE_UNUSED, char *argv[])
{
pid_t ppid;
diff --git a/whois/whois.c b/whois/whois.c
index a62f5ca..3e4f192 100644
--- a/whois/whois.c
+++ b/whois/whois.c
@@ -41,7 +41,7 @@
#define obstack_chunk_free free
#include <obstack.h>
#include <error.h>
-#include <unused-parameter.h>
+#include <attribute.h>
#include <libinetutils.h>
/* Application-specific */
@@ -103,7 +103,7 @@ static struct argp_option ripe_argp_options[] = {
static error_t
ripe_argp_parser (int key, char *arg,
- struct argp_state *state _GL_UNUSED_PARAMETER)
+ struct argp_state *state MAYBE_UNUSED)
{
if (key > 0 && (unsigned) key < 128)
{
@@ -142,7 +142,7 @@ static struct argp_option gwhois_argp_options[] = {
static error_t
gwhois_argp_parser (int key, char *arg,
- struct argp_state *state _GL_UNUSED_PARAMETER)
+ struct argp_state *state MAYBE_UNUSED)
{
char *p, *q;
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=0e4832e73a93ecd3f3365b540242839ac99343dc
commit 0e4832e73a93ecd3f3365b540242839ac99343dc
Author: Simon Josefsson <simon@josefsson.org>
Date: Wed Sep 1 22:09:22 2021 +0200
maint: Don't cc release announcement to translators.
* maint.mk (translation_project_): Set to empty.
diff --git a/cfg.mk b/cfg.mk
index a0e234e..62e47e8 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -23,6 +23,8 @@ bootstrap-tools =
gnulib,autoconf,automake,bison,m4,makeinfo,help2man,make,gzip,
old_NEWS_hash = 9e58290a292044bd6de634f52f6ed940
+translation_project_ =
+
_makefile_at_at_check_exceptions = ' && !/PATHDEFS_MAKE/'
local-checks-to-skip = \
-----------------------------------------------------------------------
Summary of changes:
bootstrap.conf | 2 +-
cfg.mk | 2 ++
configure.ac | 3 ---
ftp/cmds.c | 66 +++++++++++++++++++++++------------------------
ftp/ftp.c | 14 +++++-----
ftp/main.c | 8 +++---
ftpd/ftpd.c | 6 ++---
ftpd/pam.c | 4 +--
ftpd/server_mode.c | 4 +--
ifconfig/options.c | 6 ++---
ifconfig/printif.c | 48 +++++++++++++++++-----------------
ifconfig/system/bsd.c | 26 +++++++++----------
ifconfig/system/generic.c | 20 +++++++-------
ifconfig/system/hurd.c | 24 ++++++++---------
ifconfig/system/linux.c | 20 +++++++-------
ifconfig/system/solaris.c | 8 +++---
libinetutils/daemon.c | 4 +--
libtelnet/auth.c | 4 +--
libtelnet/encrypt.c | 10 +++----
libtelnet/kerberos5.c | 6 ++---
libtelnet/shishi.c | 8 +++---
ping/ping.c | 4 +--
ping/ping6.c | 8 +++---
ping/ping_address.c | 8 +++---
ping/ping_common.c | 2 +-
ping/ping_echo.c | 6 ++---
ping/ping_router.c | 4 +--
ping/ping_timestamp.c | 8 +++---
src/inetd.c | 22 ++++++++--------
src/logger.c | 4 +--
src/rcp.c | 6 ++---
src/rexecd.c | 8 +++---
src/rlogin.c | 10 +++----
src/rlogind.c | 8 +++---
src/rsh.c | 6 ++---
src/rshd.c | 6 ++---
src/syslogd.c | 12 ++++-----
src/tftp.c | 18 ++++++-------
src/tftpd.c | 8 +++---
src/traceroute.c | 4 +--
src/uucpd.c | 4 +--
talk/init_disp.c | 4 +--
talk/invite.c | 4 +--
talk/msgs.c | 4 +--
talkd/table.c | 4 +--
talkd/talkd.c | 6 ++---
telnet/commands.c | 4 +--
telnet/main.c | 4 +--
telnet/sys_bsd.c | 14 +++++-----
telnetd/telnetd.c | 6 ++---
tests/localhost.c | 4 +--
tests/waitdaemon.c | 6 ++---
whois/whois.c | 6 ++---
53 files changed, 257 insertions(+), 258 deletions(-)
hooks/post-receive
--
GNU Inetutils
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU Inetutils branch, master, updated. v2.2-4-gfc310f0,
Simon Josefsson <=