mdocml: merge small style improvements from christos@ to the 1.13 branch

mdocml: merge small style improvements from christos@ to the 1.13 branch

[schwarze]

Log Message:
-----------
merge small style improvements from christos@ to the 1.13 branch

Tags:
----
VERSION_1_13

Modified Files:
--------------
    mdocml:
        configure
        main.c
        mandocdb.c

Revision Data
-------------
Index: main.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/main.c,v
retrieving revision 1.273.2.7
retrieving revision 1.273.2.8
diff -Lmain.c -Lmain.c -u -p -r1.273.2.7 -r1.273.2.8
--- main.c
+++ main.c
@@ -102,7 +102,7 @@ static	void		  parse(struct curparse *, 
 static	void		  passthrough(const char *, int, int);
 static	pid_t		  spawn_pager(struct tag_files *);
 static	int		  toptions(struct curparse *, char *);
-static	void		  usage(enum argmode) __attribute__((noreturn));
+static	void		  usage(enum argmode) __attribute__((__noreturn__));
 static	int		  woptions(struct curparse *, char *);
 
 static	const int sec_prios[] = {1, 4, 5, 8, 6, 3, 7, 2, 9};
Index: mandocdb.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/mandocdb.c,v
retrieving revision 1.220.2.11
retrieving revision 1.220.2.12
diff -Lmandocdb.c -Lmandocdb.c -u -p -r1.220.2.11 -r1.220.2.12
--- mandocdb.c
+++ mandocdb.c
@@ -194,7 +194,7 @@ static	void	 putmdockey(const struct mpa
 			const struct roff_node *, uint64_t, int);
 static	int	 render_string(char **, size_t *);
 static	void	 say(const char *, const char *, ...)
-			__attribute__((__format__ (printf, 2, 3)));
+			__attribute__((__format__ (__printf__, 2, 3)));
 static	int	 set_basedir(const char *, int);
 static	int	 treescan(void);
 static	size_t	 utf8(unsigned int, char [7]);
@@ -625,7 +625,7 @@ treescan(void)
 	const char	*argv[2];
 
 	argv[0] = ".";
-	argv[1] = (char *)NULL;
+	argv[1] = NULL;
 
 	f = fts_open((char * const *)argv, FTS_PHYSICAL | FTS_NOCHDIR,
 	    fts_compare);
Index: configure
===================================================================
RCS file: /home/cvs/mdocml/mdocml/configure,v
retrieving revision 1.43.2.9
retrieving revision 1.43.2.10
diff -Lconfigure -Lconfigure -u -p -r1.43.2.9 -r1.43.2.10
--- configure
+++ configure
@@ -33,6 +33,8 @@ echo "config.log: writing..."
 # Initialize all variables here,
 # such that nothing can leak in from the environment.
 
+SOURCEDIR=`dirname "$0"`
+
 MANPATH_DEFAULT="/usr/share/man:/usr/X11R6/man:/usr/local/man"
 OSNAME=
 UTF8_LOCALE=
@@ -151,7 +153,8 @@ ${1}${3}: testing...
 ${COMP} -o test-${1} test-${1}.c ${3}
 __HEREDOC__
 
-	if ${COMP} -o "test-${1}" "test-${1}.c" ${3} 1>&3 2>&3; then
+	if ${COMP} -o "test-${1}" "${SOURCEDIR}/test-${1}.c" ${3} 1>&3 2>&3
+	then
 		echo "${1}${3}: ${CC} succeeded" 1>&3
 	else
 		echo "${1}${3}: ${CC} failed with $?" 1>&3
--
 To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv