summaryrefslogtreecommitdiffabout
path: root/Makefile
authorMark Lodato <lodatom@gmail.com>2010-09-04 15:30:18 (UTC)
committer Mark Lodato <lodatom@gmail.com>2010-09-04 15:35:38 (UTC)
commite4ddc8f72b5a7d8c55a6c2042c7b7f945ba4b1a2 (patch) (unidiff)
tree2ade0bb45e15ad5466ca4d3433201477f0c9214e /Makefile
parenta4c58d92bfee0cf2e35ab1c5e828a6d790108a69 (diff)
downloadcgit-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>
Diffstat (limited to 'Makefile') (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile8
1 files changed, 8 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 2a15469..6c9d118 100644
--- a/Makefile
+++ b/Makefile
@@ -7,24 +7,29 @@ CACHE_ROOT = /var/cache/cgit
7SHA1_HEADER = <openssl/sha.h> 7SHA1_HEADER = <openssl/sha.h>
8GIT_VER = 1.7.2.2 8GIT_VER = 1.7.2.2
9GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 9GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
10INSTALL = install 10INSTALL = 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
26uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') 31uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
27uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not') 32uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not')
28uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not') 33uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not')
29 34
30ifeq ($(uname_O),Cygwin) 35ifeq ($(uname_O),Cygwin)
@@ -118,24 +123,27 @@ CFLAGS += -g -Wall -Igit
118CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' 123CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)'
119CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' 124CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"'
120CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' 125CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"'
121CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' 126CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
122CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' 127CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
123 128
124ifdef NO_ICONV 129ifdef NO_ICONV
125 CFLAGS += -DNO_ICONV 130 CFLAGS += -DNO_ICONV
126endif 131endif
127ifdef NO_STRCASESTR 132ifdef NO_STRCASESTR
128 CFLAGS += -DNO_STRCASESTR 133 CFLAGS += -DNO_STRCASESTR
129endif 134endif
135ifdef NO_C99_FORMAT
136 CFLAGS += -DNO_C99_FORMAT
137endif
130ifdef NO_OPENSSL 138ifdef NO_OPENSSL
131 CFLAGS += -DNO_OPENSSL 139 CFLAGS += -DNO_OPENSSL
132 GIT_OPTIONS += NO_OPENSSL=1 140 GIT_OPTIONS += NO_OPENSSL=1
133else 141else
134 EXTLIBS += -lcrypto 142 EXTLIBS += -lcrypto
135endif 143endif
136 144
137cgit: $(OBJECTS) libgit 145cgit: $(OBJECTS) libgit
138 $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) 146 $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS)
139 147
140cgit.o: VERSION 148cgit.o: VERSION
141 149