Sophie

Sophie

distrib > Altlinux > 4.1 > i586 > media > core-src > by-pkgid > 7bbfdc5d7d979551f616ca15acbe85d2 > files > 1

ftpproxy-1.2.3-alt1.src.rpm

Declaration fixes and so on - for compilling with -Werror

--- src/daemon.c.orig	2008-03-15 16:31:05 +0300
+++ src/daemon.c	2008-03-15 16:31:33 +0300
@@ -51,7 +51,8 @@
 
 int acceptloop(int sock)
 {
-	int	connect, pid, len;
+	int	connect, pid;
+	socklen_t len;
 	struct sockaddr_in client;
 
 	/*
--- src/ftp.c.orig	2008-03-15 16:20:52 +0300
+++ src/ftp.c	2008-03-15 16:30:38 +0300
@@ -115,7 +115,7 @@
 
 unsigned get_interface_info(int pfd, char *ip, int max)
 {
-	int	size;
+	socklen_t	size;
 	unsigned int port;
 	struct sockaddr_in saddr;
 
@@ -133,7 +133,7 @@
 
 int get_client_info(ftp_t *x, int pfd)
 {
-	int	size;
+	socklen_t	size;
 	struct sockaddr_in saddr;
 	struct in_addr *addr;
 	struct hostent *hostp = NULL;
@@ -274,7 +274,8 @@
 				}
 			else if (FD_ISSET(x->ch.active, &available)) {
 				if (x->ch.state == PORT_LISTEN) {
-					int	sock, adrlen;
+					int	sock;
+					socklen_t adrlen;
 					struct sockaddr_in adr;
 
 					earlyreported = 0;
@@ -509,12 +510,13 @@
 int cfputs(ftp_t *x, char *line)
 {
 	char	buffer[310];
+	int	wrtlen;
 
 	if (debug)
 		fprintf (stderr, ">>> CLI: %s\n", line);
 
 	snprintf (buffer, sizeof(buffer) - 2, "%s\r\n", line);
-	write(1, buffer, strlen(buffer));
+	wrtlen=write(1, buffer, strlen(buffer));
 
 	return (0);
 }
@@ -1823,7 +1825,7 @@
 				syslog(LOG_NOTICE, "%s %s: %ld bytes", x->ch.command, x->ch.filename, x->ch.bytes);
 
 				if (x->xlfp != NULL) {
-					unsigned long now;
+					time_t	 now;
 					char	date[80];
 
 					/*
--- src/lib.c.orig	2008-03-15 16:31:51 +0300
+++ src/lib.c	2008-03-15 16:33:07 +0300
@@ -141,7 +141,7 @@
 char *strlwr(char *string)
 {
 	unsigned int c;
-	unsigned char *p;
+	char *p;
 
 	if (lower['0'] == 0)
 		_init_lower();
@@ -157,7 +157,7 @@
 char *strupr(char *string)
 {
 	unsigned int c;
-	unsigned char *p;
+	char *p;
 
 	if (upper['0'] == 0)
 		_init_upper();
@@ -183,7 +183,7 @@
 char *noctrl(char *buffer)
 {
 	int	len, i;
-	unsigned char *p;
+	char *p;
 
 	if ((p = buffer) == NULL)
 		return (NULL);
@@ -202,7 +202,7 @@
 char *get_word(char **from, char *to, int maxlen)
 {
 	unsigned int c;
-	unsigned char *p;
+	char *p;
 	int	k;
 
 	maxlen -= 2;