[hackers] [wmii] -DVERSION only once.

changeset: 2178:8cd6fe801e3e
parent: 2176:bbec4f77e055
user: Kris Maglione <jg_AT_suckless.org>
date: Sun Jul 01 17:43:27 2007 -0400
summary: -DVERSION only once.

diff -r 1f961408d106 -r 8cd6fe801e3e cmd/util.c
--- a/cmd/util.c Sun Jul 01 17:35:28 2007 -0400
+++ b/cmd/util.c Sun Jul 01 17:43:27 2007 -0400
@@ -13,10 +13,14 @@ Vfmt(Fmt *f) {
 Vfmt(Fmt *f) {
         char *fmt;
         va_list ap;
+ int i;
 
         fmt = va_arg(f->args, char*);
         va_copy(ap, va_arg(f->args, va_list));
- return fmtvprint(f, fmt, ap);
+
+ i = fmtvprint(f, fmt, ap);
+ va_end(ap);
+ return i;
 }
 
 void
diff -r 1f961408d106 -r 8cd6fe801e3e cmd/wmii/Makefile
--- a/cmd/wmii/Makefile Sun Jul 01 17:35:28 2007 -0400
+++ b/cmd/wmii/Makefile Sun Jul 01 17:43:27 2007 -0400
@@ -9,7 +9,7 @@ HFILES= dat.h fns.h x11.h
 
 LIB = ${LIBIXP}
 LDFLAGS += -lm ${LIBX11} -lXext ${LIBICONV} -lregexp9 -lbio -lfmt -lutf
-CFLAGS += ${INCX11} ${INCICONV} -DVERSION=\"${VERSION}\"
+CFLAGS += ${INCX11} ${INCICONV}
 OBJ = area \
         bar \
         client \
diff -r 1f961408d106 -r 8cd6fe801e3e cmd/wmii/dat.h
--- a/cmd/wmii/dat.h Sun Jul 01 17:35:28 2007 -0400
+++ b/cmd/wmii/dat.h Sun Jul 01 17:43:27 2007 -0400
@@ -13,6 +13,14 @@
 #define FONT "-*-fixed-medium-r-*-*-13-*-*-*-*-*-*-*"
 #define FOCUSCOLORS "#ffffff #335577 #447799"
 #define NORMCOLORS "#222222 #eeeeee #666666"
+
+#ifdef VARARGCK
+# pragma varargck type "C" Client*
+# pragma varargck type "W" Window*
+# pragma varargck type "P" Point
+# pragma varargck type "R" Rectangle
+# pragma varargck type "r" void
+#endif
 
 typedef struct CTuple CTuple;
 
diff -r 1f961408d106 -r 8cd6fe801e3e cmd/wmii/fns.h
--- a/cmd/wmii/fns.h Sun Jul 01 17:35:28 2007 -0400
+++ b/cmd/wmii/fns.h Sun Jul 01 17:43:27 2007 -0400
@@ -1,6 +1,10 @@
 /* © 2004-2006 Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
+
+#ifdef VARARGCK
+# pragma varargck argpos write_event 1
+#endif
 
 /* area.c */
 char *area_name(Area *a);
diff -r 1f961408d106 -r 8cd6fe801e3e cmd/wmii/utf.c
--- a/cmd/wmii/utf.c Sun Jul 01 17:35:28 2007 -0400
+++ b/cmd/wmii/utf.c Sun Jul 01 17:43:27 2007 -0400
@@ -1,5 +1,4 @@
 /* Public Domain --Kris Maglione */
-#include <errno.h>
 #include <iconv.h>
 #include <string.h>
 #include <util.h>
diff -r 1f961408d106 -r 8cd6fe801e3e util/compile
--- a/util/compile Sun Jul 01 17:35:28 2007 -0400
+++ b/util/compile Sun Jul 01 17:43:27 2007 -0400
@@ -11,10 +11,10 @@ echo CC $($bin/cleanname ${BASE}$outfile
 $CC -o $outfile $CFLAGS $@ 2>$xtmp
 status=$?
 
-base=$(echo $BASE | sed 's/,/\\,/g; s,/$,,')
+base=$(echo $BASE | sed 's/,/\\,/g')
 re='\([^[:space:]/]*\..:[0-9]\)'
 
-cat $xtmp | sed "s,^$re,$base/&,g; s,\([[:space:]]\)$re,\1$base/\2,g" |
+cat $xtmp | sed "s,^$re,$base&,g; s,\([[:space:]]\)$re,\1$base\2,g" |
         egrep -v ': error: .Each undeclared identifier|: error: for each function it appears|is dangerous, better use|is almost always misused|: In function |: At top level:|support .long long.|use of C99 long long|ISO C forbids conversion' |
         sed 's/ .first use in this function.$//; s/\"\([^\"][^\"]*\)\", line \([0-9][0-9]*\)/\1:\2/g' |
         uniq 1>&2
Received on Sun Jul 01 2007 - 23:48:02 UTC