Compare commits

...

9 Commits
master ... 1.4

Author SHA1 Message Date
Mukund Sivaraman
dea98a3b08 Renamed configure.in to configure.ac 2008-03-13 15:12:08 -07:00
Mukund Sivaraman
7c1548cfce Fixed format string warnings 2008-03-13 15:12:06 -07:00
Mukund Sivaraman
ed253766ea Removed the clean target from the src directory
This was overriding the automake clean target to clean up
files like *.o by default.
2008-03-13 15:12:03 -07:00
Mukund Sivaraman
772c2849e8 Removed duplicate yylineno definition from scanner.l 2008-03-13 15:12:01 -07:00
Mukund Sivaraman
25537d30d3 Corrected datatype of namelen to fix compiler warning 2008-03-13 15:11:59 -07:00
Mukund Sivaraman
625cecf492 Removed empty else part of AC_CHECK_FUNC() which caused configure to fail as the generated syntax in it was incorrect 2008-03-13 15:11:54 -07:00
Mukund Sivaraman
86f38819c0 Added .gitignore files 2008-03-13 15:11:51 -07:00
Mukund Sivaraman
7b2892be76 Renamed reconf to autogen.sh 2008-03-13 15:11:45 -07:00
cvs2svn
ad99033ae4 This commit was manufactured by cvs2svn to create branch
'release_1_4_3_patches'.
2001-11-21 19:35:52 +00:00
9 changed files with 35 additions and 10 deletions

18
.gitignore vendored Normal file
View File

@ -0,0 +1,18 @@
COPYING
INSTALL
Makefile
Makefile.in
NEWS
aclocal.m4
config.cache
config.h
config.h.in
config.log
config.status
configure
depcomp
install-sh
libtool
missing
mkinstalldirs
stamp-h1

View File

View File

@ -142,7 +142,7 @@ dnl avoid -lnsl checks, if we already have the functions which are
dnl usually in libnsl dnl usually in libnsl
unset ac_cv_func_yp_get_default_domain unset ac_cv_func_yp_get_default_domain
AC_CHECK_FUNC(yp_get_default_domain, [ tinyproxy_no_nsl_checks=yes ], [ ]) AC_CHECK_FUNC(yp_get_default_domain, [ tinyproxy_no_nsl_checks=yes ])
unset ac_cv_func_yp_get_default_domain unset ac_cv_func_yp_get_default_domain
if test "$tinyproxy_no_nsl_checks" != "yes"; then if test "$tinyproxy_no_nsl_checks" != "yes"; then

3
doc/.gitignore vendored Normal file
View File

@ -0,0 +1,3 @@
Makefile
Makefile.in
report.sh

8
src/.gitignore vendored Normal file
View File

@ -0,0 +1,8 @@
.deps
.libs
Makefile
Makefile.in
grammar.c
grammar.h
scanner.c
tinyproxy

View File

@ -47,6 +47,3 @@ EXTRA_tinyproxy_SOURCES = grammar.h
scanner.c: scanner.l grammar.h scanner.c: scanner.l grammar.h
$(LEX) $(AM_LFLAGS) $(LFLAGS) -i $< && mv $(LEX_OUTPUT_ROOT).c $@ $(LEX) $(AM_LFLAGS) $(LFLAGS) -i $< && mv $(LEX_OUTPUT_ROOT).c $@
clean:
rm -f *.da
rm -f gmon.out

View File

@ -71,7 +71,6 @@ static struct keyword keywords[] = {
#define MAX_REGEXP_LEN 1024 #define MAX_REGEXP_LEN 1024
unsigned int yylineno = 1;
char tiny_buf[MAX_REGEXP_LEN]; char tiny_buf[MAX_REGEXP_LEN];
char *tiny_str; char *tiny_str;

View File

@ -155,7 +155,7 @@ int listen_sock(uint16_t port, socklen_t *addrlen)
char *getpeer_ip(int fd, char *ipaddr) char *getpeer_ip(int fd, char *ipaddr)
{ {
struct sockaddr_in name; struct sockaddr_in name;
size_t namelen = sizeof(name); socklen_t namelen = sizeof(name);
assert(fd >= 0); assert(fd >= 0);
assert(ipaddr != NULL); assert(ipaddr != NULL);
@ -183,7 +183,7 @@ char *getpeer_ip(int fd, char *ipaddr)
char *getpeer_string(int fd, char *string) char *getpeer_string(int fd, char *string)
{ {
struct sockaddr_in name; struct sockaddr_in name;
size_t namelen = sizeof(name); socklen_t namelen = sizeof(name);
struct hostent *peername; struct hostent *peername;
assert(fd >= 0); assert(fd >= 0);

View File

@ -35,21 +35,21 @@
void *debugging_calloc(size_t nmemb, size_t size, const char *file, unsigned long line) void *debugging_calloc(size_t nmemb, size_t size, const char *file, unsigned long line)
{ {
void *ptr = calloc(nmemb, size); void *ptr = calloc(nmemb, size);
fprintf(stderr, "{calloc: %p:%u x %u} %s:%lu\n", ptr, nmemb, size, file, line); fprintf(stderr, "{calloc: %p:%zu x %zu} %s:%lu\n", ptr, nmemb, size, file, line);
return ptr; return ptr;
} }
void *debugging_malloc(size_t size, const char *file, unsigned long line) void *debugging_malloc(size_t size, const char *file, unsigned long line)
{ {
void *ptr = malloc(size); void *ptr = malloc(size);
fprintf(stderr, "{malloc: %p:%u} %s:%lu\n", ptr, size, file, line); fprintf(stderr, "{malloc: %p:%zu} %s:%lu\n", ptr, size, file, line);
return ptr; return ptr;
} }
void *debugging_realloc(void *ptr, size_t size, const char *file, unsigned long line) void *debugging_realloc(void *ptr, size_t size, const char *file, unsigned long line)
{ {
void *newptr = realloc(ptr, size); void *newptr = realloc(ptr, size);
fprintf(stderr, "{realloc: %p -> %p:%u} %s:%lu\n", ptr, newptr, size, file, line); fprintf(stderr, "{realloc: %p -> %p:%zu} %s:%lu\n", ptr, newptr, size, file, line);
return newptr; return newptr;
} }