author | Mark Lodato <lodatom@gmail.com> | 2010-09-04 15:30:18 (UTC) |
---|---|---|
committer | Mark Lodato <lodatom@gmail.com> | 2010-09-04 15:35:38 (UTC) |
commit | e4ddc8f72b5a7d8c55a6c2042c7b7f945ba4b1a2 (patch) (unidiff) | |
tree | 2ade0bb45e15ad5466ca4d3433201477f0c9214e /Makefile | |
parent | a4c58d92bfee0cf2e35ab1c5e828a6d790108a69 (diff) | |
download | cgit-e4ddc8f72b5a7d8c55a6c2042c7b7f945ba4b1a2.zip cgit-e4ddc8f72b5a7d8c55a6c2042c7b7f945ba4b1a2.tar.gz cgit-e4ddc8f72b5a7d8c55a6c2042c7b7f945ba4b1a2.tar.bz2 |
fix errors in printf-style format strings
There were many places where the arguments to a printf-like function did
not match the format string. Mostly, these were a missing 'l' flag, but
there were three exceptions:
- In ui-stats.c, a size_t argument must be printed. C99 has the "%zu"
flag for this purpose, but not all compilers support this. Therefore,
we mimic what git does - use a NO_C99_FORMAT Makefile variable.
- In ui-stats.c, cgit_print_error() was called with a pointer instead of
a character.
- In ui-log.c, the "columns" argument was never used.
Signed-off-by: Mark Lodato <lodatom@gmail.com>
-rw-r--r-- | Makefile | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -3,32 +3,37 @@ CGIT_SCRIPT_NAME = cgit.cgi | |||
3 | CGIT_SCRIPT_PATH = /var/www/htdocs/cgit | 3 | CGIT_SCRIPT_PATH = /var/www/htdocs/cgit |
4 | CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH) | 4 | CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH) |
5 | CGIT_CONFIG = /etc/cgitrc | 5 | CGIT_CONFIG = /etc/cgitrc |
6 | CACHE_ROOT = /var/cache/cgit | 6 | CACHE_ROOT = /var/cache/cgit |
7 | SHA1_HEADER = <openssl/sha.h> | 7 | SHA1_HEADER = <openssl/sha.h> |
8 | GIT_VER = 1.7.2.2 | 8 | GIT_VER = 1.7.2.2 |
9 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 | 9 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 |
10 | INSTALL = install | 10 | INSTALL = install |
11 | 11 | ||
12 | # Define NO_STRCASESTR if you don't have strcasestr. | 12 | # Define NO_STRCASESTR if you don't have strcasestr. |
13 | # | 13 | # |
14 | # Define NO_OPENSSL to disable linking with OpenSSL and use bundled SHA1 | 14 | # Define NO_OPENSSL to disable linking with OpenSSL and use bundled SHA1 |
15 | # implementation (slower). | 15 | # implementation (slower). |
16 | # | 16 | # |
17 | # Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin). | 17 | # Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin). |
18 | # | 18 | # |
19 | # Define NO_C99_FORMAT if your formatted IO functions (printf/scanf et.al.) | ||
20 | # do not support the 'size specifiers' introduced by C99, namely ll, hh, | ||
21 | # j, z, t. (representing long long int, char, intmax_t, size_t, ptrdiff_t). | ||
22 | # some C compilers supported these specifiers prior to C99 as an extension. | ||
23 | # | ||
19 | 24 | ||
20 | #-include config.mak | 25 | #-include config.mak |
21 | 26 | ||
22 | # | 27 | # |
23 | # Platform specific tweaks | 28 | # Platform specific tweaks |
24 | # | 29 | # |
25 | 30 | ||
26 | uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') | 31 | uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') |
27 | uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not') | 32 | uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not') |
28 | uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not') | 33 | uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not') |
29 | 34 | ||
30 | ifeq ($(uname_O),Cygwin) | 35 | ifeq ($(uname_O),Cygwin) |
31 | NO_STRCASESTR = YesPlease | 36 | NO_STRCASESTR = YesPlease |
32 | NEEDS_LIBICONV = YesPlease | 37 | NEEDS_LIBICONV = YesPlease |
33 | endif | 38 | endif |
34 | 39 | ||
@@ -114,32 +119,35 @@ VERSION: force-version | |||
114 | -include VERSION | 119 | -include VERSION |
115 | 120 | ||
116 | 121 | ||
117 | CFLAGS += -g -Wall -Igit | 122 | CFLAGS += -g -Wall -Igit |
118 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' | 123 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' |
119 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' | 124 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' |
120 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' | 125 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' |
121 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' | 126 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' |
122 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' | 127 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' |
123 | 128 | ||
124 | ifdef NO_ICONV | 129 | ifdef NO_ICONV |
125 | CFLAGS += -DNO_ICONV | 130 | CFLAGS += -DNO_ICONV |
126 | endif | 131 | endif |
127 | ifdef NO_STRCASESTR | 132 | ifdef NO_STRCASESTR |
128 | CFLAGS += -DNO_STRCASESTR | 133 | CFLAGS += -DNO_STRCASESTR |
129 | endif | 134 | endif |
135 | ifdef NO_C99_FORMAT | ||
136 | CFLAGS += -DNO_C99_FORMAT | ||
137 | endif | ||
130 | ifdef NO_OPENSSL | 138 | ifdef NO_OPENSSL |
131 | CFLAGS += -DNO_OPENSSL | 139 | CFLAGS += -DNO_OPENSSL |
132 | GIT_OPTIONS += NO_OPENSSL=1 | 140 | GIT_OPTIONS += NO_OPENSSL=1 |
133 | else | 141 | else |
134 | EXTLIBS += -lcrypto | 142 | EXTLIBS += -lcrypto |
135 | endif | 143 | endif |
136 | 144 | ||
137 | cgit: $(OBJECTS) libgit | 145 | cgit: $(OBJECTS) libgit |
138 | $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) | 146 | $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) |
139 | 147 | ||
140 | cgit.o: VERSION | 148 | cgit.o: VERSION |
141 | 149 | ||
142 | ifneq "$(MAKECMDGOALS)" "clean" | 150 | ifneq "$(MAKECMDGOALS)" "clean" |
143 | -include $(OBJECTS:.o=.d) | 151 | -include $(OBJECTS:.o=.d) |
144 | endif | 152 | endif |
145 | 153 | ||