Merge branch 'master' of git://git.linux-ax25.org/pub/scm/ralf/ax25-tools

Conflicts:
	ax25/axspawn.c

6 files changed, 42 insertions, 45 deletions

diff --git a/user_call/Makefile.am b/user_call/Makefile.am
index 1911d6f..d7b1fb8 100644
--- a/user_call/Makefile.am
+++ b/user_call/Makefile.am
@@ -4,11 +4,9 @@ installconf:
 
 sbin_PROGRAMS = ax25_call netrom_call rose_call tcp_call
 
-man_MANS = ax25_call.8 netrom_call.8 rose_call.8 tcp_call.8
+dist_man_MANS = ax25_call.8 netrom_call.8 rose_call.8 tcp_call.8
 
-doc_DATA= README.user_call
-
-EXTRA_DIST = $(man_MANS) $(doc_DATA)
+dist_doc_DATA= README.user_call
 
 LDADD = $(AX25_LIB) $(Z_LIB)
 
@@ -27,4 +25,3 @@ rose_call_SOURCES =	rose_call.c \
 tcp_call_SOURCES =	tcp_call.c \
 			user_io.c \
 			user_io.h
-
diff --git a/user_call/ax25_call.8 b/user_call/ax25_call.8
index 81b305f..ce1d394 100644
--- a/user_call/ax25_call.8
+++ b/user_call/ax25_call.8
@@ -27,7 +27,7 @@ For
 .B netrom_call
 the  remote_netrom_addr  parameter may either be in the form of a single
 callsign or as a NET/ROM alias  and  callsign  pair separated by
-colon. For example NMCLUS:GB7BPQ. 
+colon. For example NMCLUS:GB7BPQ.
 .sp
 For
 .B rose_call
diff --git a/user_call/ax25_call.c b/user_call/ax25_call.c
index 1fafe4f..29b788e 100644
--- a/user_call/ax25_call.c
+++ b/user_call/ax25_call.c
@@ -123,18 +123,18 @@ int main(int argc, char **argv)
 	 */
 	if (connect(s, (struct sockaddr *)&axconnect, addrlen) != 0) {
 		switch (errno) {
-			case ECONNREFUSED:
-				strcpy(buffer, "*** Connection refused - aborting\r");
-				break;
-			case ENETUNREACH:
-				strcpy(buffer, "*** No known route - aborting\r");
-				break;
-			case EINTR:
-				strcpy(buffer, "*** Connection timed out - aborting\r");
-				break;
-			default:
-				sprintf(buffer, "ERROR: cannot connect to AX.25 callsign, %s\r", strerror(errno));
-				break;
+		case ECONNREFUSED:
+			strcpy(buffer, "*** Connection refused - aborting\r");
+			break;
+		case ENETUNREACH:
+			strcpy(buffer, "*** No known route - aborting\r");
+			break;
+		case EINTR:
+			strcpy(buffer, "*** Connection timed out - aborting\r");
+			break;
+		default:
+			sprintf(buffer, "ERROR: cannot connect to AX.25 callsign, %s\r", strerror(errno));
+			break;
 		}
 
 		err(buffer);
diff --git a/user_call/netrom_call.c b/user_call/netrom_call.c
index 8d7fd85..e247e8c 100644
--- a/user_call/netrom_call.c
+++ b/user_call/netrom_call.c
@@ -134,18 +134,18 @@ int main(int argc, char **argv)
 	 */
 	if (connect(s, (struct sockaddr *)&nrconnect, addrlen) != 0) {
 		switch (errno) {
-			case ECONNREFUSED:
-				strcpy(buffer, "*** Connection refused - aborting\r");
-				break;
-			case ENETUNREACH:
-				strcpy(buffer, "*** No known route - aborting\r");
-				break;
-			case EINTR:
-				strcpy(buffer, "*** Connection timed out - aborting\r");
-				break;
-			default:
-				sprintf(buffer, "ERROR: cannot connect to NET/ROM node, %s\r", strerror(errno));
-				break;
+		case ECONNREFUSED:
+			strcpy(buffer, "*** Connection refused - aborting\r");
+			break;
+		case ENETUNREACH:
+			strcpy(buffer, "*** No known route - aborting\r");
+			break;
+		case EINTR:
+			strcpy(buffer, "*** Connection timed out - aborting\r");
+			break;
+		default:
+			sprintf(buffer, "ERROR: cannot connect to NET/ROM node, %s\r", strerror(errno));
+			break;
 		}
 
 		err(buffer);
diff --git a/user_call/rose_call.c b/user_call/rose_call.c
index 43a27ae..602b1fe 100644
--- a/user_call/rose_call.c
+++ b/user_call/rose_call.c
@@ -129,18 +129,18 @@ int main(int argc, char **argv)
 	 */
 	if (connect(s, (struct sockaddr *)&roseconnect, addrlen) != 0) {
 		switch (errno) {
-			case ECONNREFUSED:
-				strcpy(buffer, "*** Connection refused - aborting\r");
-				break;
-			case ENETUNREACH:
-				strcpy(buffer, "*** No known route - aborting\r");
-				break;
-			case EINTR:
-				strcpy(buffer, "*** Connection timed out - aborting\r");
-				break;
-			default:
-				sprintf(buffer, "ERROR: cannot connect to Rose address, %s\r", strerror(errno));
-				break;
+		case ECONNREFUSED:
+			strcpy(buffer, "*** Connection refused - aborting\r");
+			break;
+		case ENETUNREACH:
+			strcpy(buffer, "*** No known route - aborting\r");
+			break;
+		case EINTR:
+			strcpy(buffer, "*** Connection timed out - aborting\r");
+			break;
+		default:
+			sprintf(buffer, "ERROR: cannot connect to Rose address, %s\r", strerror(errno));
+			break;
 		}
 
 		err(buffer);
diff --git a/user_call/user_io.c b/user_call/user_io.c
index c486e46..0a25136 100644
--- a/user_call/user_io.c
+++ b/user_call/user_io.c
@@ -11,7 +11,7 @@
 
 #define BUFLEN	8192
 
-int compression		= 0;
+int compression;
 int paclen_in		= 256;
 int paclen_out		= 256;
 
@@ -22,7 +22,7 @@ static unsigned char buf[BUFLEN];
 #include <zlib.h>
 
 /* Error in (de)compression happened? */
-static int compression_error = 0;
+static int compression_error;
 
 /* These are for the (de)compressor */
 static unsigned char input_buffer[BUFLEN];
@@ -193,7 +193,7 @@ int select_loop(int s)
 		FD_ZERO(&read_fd);
 		FD_SET(STDIN_FILENO, &read_fd);
 		FD_SET(s, &read_fd);
-		
+
 		select(s + 1, &read_fd, NULL, NULL, NULL);
 
 		if (FD_ISSET(s, &read_fd)) {