diff --git a/src/ccextractor.c b/src/ccextractor.c
index ce82f667..68ef5a25 100644
--- a/src/ccextractor.c
+++ b/src/ccextractor.c
@@ -68,11 +68,11 @@ int main(int argc, char *argv[])
 	{
 		fatal(EXIT_TOO_MANY_INPUT_FILES, "UDP mode is not compatible with input files.\n");
 	}
-	if (ccx_options.input_source==CCX_DS_NETWORK || ccx_options.input_source==CCX_DS_TCP)
+	if (ccx_options.input_source == CCX_DS_NETWORK || ccx_options.input_source == CCX_DS_TCP)
 	{
 		ccx_options.buffer_input=1; // Mandatory, because each datagram must be read complete.
 	}
-	if (ctx->num_input_files && ccx_options.input_source==CCX_DS_TCP)
+	if (ctx->num_input_files && ccx_options.input_source == CCX_DS_TCP)
 	{
 		fatal(EXIT_TOO_MANY_INPUT_FILES, "TCP mode is not compatible with input files.\n");
 	}
diff --git a/src/lib_ccx/file_functions.c b/src/lib_ccx/file_functions.c
index 6d0e622c..7b42f02f 100644
--- a/src/lib_ccx/file_functions.c
+++ b/src/lib_ccx/file_functions.c
@@ -149,9 +149,9 @@ int switch_to_next_file (struct lib_ccx_ctx *ctx, LLONG bytesinbuffer)
 		}
 
 		ctx->infd = start_upd_srv(ccx_options.udpaddr, ccx_options.udpport);
-		return 1;
 		if(ctx->infd < 0)
 			fatal (CCX_COMMON_EXIT_BUG_BUG, "socket() failed.");
+		return 1;
 
 	}
 
diff --git a/src/lib_ccx/params.c b/src/lib_ccx/params.c
index 01345fb4..955a190f 100644
--- a/src/lib_ccx/params.c
+++ b/src/lib_ccx/params.c
@@ -1577,7 +1577,7 @@ void parse_parameters (struct ccx_s_options *opt, int argc, char *argv[])
 				opt->udpport = atoi_hex(argv[i + 1]);
 			}
 
-			opt->input_source=CCX_DS_NETWORK;
+			opt->input_source = CCX_DS_NETWORK;
 			i++;
 			continue;
 		}