Author: ed
Date: Fri Oct 14 07:28:39 2011
New Revision: 226362
URL: http://svn.freebsd.org/changeset/base/226362
Log:
Make nl(1) build with WARNS=6.
Obtained from: NetBSD
Modified:
head/usr.bin/nl/Makefile
head/usr.bin/nl/nl.c
Modified: head/usr.bin/nl/Makefile
==============================================================================
--- head/usr.bin/nl/Makefile Fri Oct 14 07:26:20 2011 (r226361)
+++ head/usr.bin/nl/Makefile Fri Oct 14 07:28:39 2011 (r226362)
@@ -2,6 +2,4 @@
PROG= nl
-WARNS?= 2
-
.include <bsd.prog.mk>
Modified: head/usr.bin/nl/nl.c
==============================================================================
--- head/usr.bin/nl/nl.c Fri Oct 14 07:26:20 2011 (r226361)
+++ head/usr.bin/nl/nl.c Fri Oct 14 07:28:39 2011 (r226362)
@@ -73,9 +73,9 @@ struct numbering_property {
#define NP_LAST HEADER
static struct numbering_property numbering_properties[NP_LAST + 1] = {
- { "footer", number_none },
- { "body", number_nonempty },
- { "header", number_none }
+ { .name = "footer", .type = number_none },
+ { .name = "body", .type = number_nonempty },
+ { .name = "header", .type = number_none }
};
#define max(a, b) ((a) > (b) ? (a) : (b))
@@ -128,9 +128,7 @@ static int width = 6;
int
-main(argc, argv)
- int argc;
- char *argv[];
+main(int argc, char *argv[])
{
int c;
long val;
@@ -258,7 +256,7 @@ main(argc, argv)
delimlen = delim1len + delim2len;
/* Allocate a buffer suitable for preformatting line number. */
- intbuffersize = max(INT_STRLEN_MAXIMUM, width) + 1; /* NUL */
+ intbuffersize = max((int)INT_STRLEN_MAXIMUM, width) + 1; /* NUL */
if ((intbuffer = malloc(intbuffersize)) == NULL)
err(EXIT_FAILURE, "cannot allocate preformatting buffer");
@@ -270,7 +268,7 @@ main(argc, argv)
}
static void
-filter()
+filter(void)
{
char *buffer;
size_t buffersize;
@@ -359,9 +357,7 @@ nextline:
*/
static void
-parse_numbering(argstr, section)
- const char *argstr;
- int section;
+parse_numbering(const char *argstr, int section)
{
int error;
char errorbuf[NL_TEXTMAX];
@@ -403,7 +399,7 @@ parse_numbering(argstr, section)
}
static void
-usage()
+usage(void)
{
(void)fprintf(stderr,
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
