From 9ef350ae3fee7517c0466c3e6fcd072efbf19fd7 Mon Sep 17 00:00:00 2001
From: AngelCarpintero <AngelCarpintero@4132a67d-e308-0410-984c-893ed6249e5e>
Date: Tue, 24 Jan 2006 05:30:47 +0000
Subject: [PATCH] Costmetic changes done , removing not needed includes from
 many files , usually because they already includes motion.h that has already
 needed files included.

---
 alg.c           |  9 ---------
 conf.c          |  3 +--
 event.c         |  8 ++------
 netcam.c        |  1 -
 netcam_ftp.c    |  1 -
 netcam_wget.c   |  1 -
 picture.c       |  1 -
 track.c         | 13 +++----------
 video.c         |  1 -
 video_freebsd.c |  3 +--
 webcam.c        |  3 +--
 webhttpd.c      |  3 ---
 12 files changed, 8 insertions(+), 39 deletions(-)

diff --git a/alg.c b/alg.c
index 8997b4ef..20fc441c 100644
--- a/alg.c
+++ b/alg.c
@@ -7,16 +7,7 @@
  *
  */
 #include "motion.h"
-
-#ifdef __freebsd__
-#include "video_freebsd.h"
-#else
-#include "video.h"
-#endif /* __freebsd__ */
-
-#include "conf.h"
 #include "alg.h"
-#include "event.h"
 
 #ifdef __MMX__
 #define HAVE_MMX
diff --git a/conf.c b/conf.c
index 28de73d1..f9a9ba42 100644
--- a/conf.c
+++ b/conf.c
@@ -25,14 +25,13 @@
  */
 #include "motion.h"
 
+
 #ifdef __freebsd__
 #include "video_freebsd.h"
 #else
 #include "video.h"
 #endif /* __freebsd__ */
 
-#include "conf.h"
-#include "track.h"
 
 #define stripnewline(x) {if ((x)[strlen(x)-1]=='\n') (x)[strlen(x) - 1] = 0; }
 
diff --git a/event.c b/event.c
index f357ca79..636456d1 100644
--- a/event.c
+++ b/event.c
@@ -12,13 +12,9 @@
 #include "ffmpeg.h"           /* must be first to avoid 'shadow' warning */
 #include "motion.h"
 #include "event.h"
-
-#ifdef __freebsd__
-#include "video_freebsd.h"
-#else
+#ifndef __freebsd__
 #include "video.h"
-#endif /* __freebsd__ */
-
+#endif
 #include "picture.h"
 
 /*
diff --git a/netcam.c b/netcam.c
index ef343b42..871b7786 100644
--- a/netcam.c
+++ b/netcam.c
@@ -48,7 +48,6 @@
 #include <sys/socket.h>
 #include <sys/types.h>
 
-#include "netcam_wget.h"
 #include "netcam_ftp.h"
 
 #define CONNECT_TIMEOUT        10   /* timeout on remote connection attempt */
diff --git a/netcam_ftp.c b/netcam_ftp.c
index c2e97050..7955694f 100644
--- a/netcam_ftp.c
+++ b/netcam_ftp.c
@@ -26,7 +26,6 @@
 #include <sys/types.h>
 #include <netinet/in.h>
 
-#include "netcam.h"
 #include "netcam_ftp.h"
 
 /**
diff --git a/netcam_wget.c b/netcam_wget.c
index f08f8ea9..b6145ab3 100644
--- a/netcam_wget.c
+++ b/netcam_wget.c
@@ -27,7 +27,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 #include <ctype.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-#include "netcam_wget.h"
 
 #define MINVAL(x, y) ((x) < (y) ? (x) : (y))
 
diff --git a/picture.c b/picture.c
index e0498532..14204217 100644
--- a/picture.c
+++ b/picture.c
@@ -9,7 +9,6 @@
  */
 
 #include "picture.h"
-#include "motion.h"
 #include "event.h"
 
 #include <jpeglib.h>
diff --git a/track.c b/track.c
index 4dfaafb1..74c2ecc6 100644
--- a/track.c
+++ b/track.c
@@ -9,16 +9,9 @@
 #include <math.h>
 #include <termios.h>
 #include "motion.h"
-
-#ifdef __freebsd__
-#include "video_freebsd.h"
-#else
-#include "video.h"
-#endif /* __freebsd__ */
-
-#include "conf.h"
-#include "track.h"
-#include "alg.h"
+//#include "conf.h"
+//#include "track.h"
+//#include "alg.h"
 
 #include "pwc-ioctl.h"
 
diff --git a/video.c b/video.c
index 40dba033..0bed0ced 100644
--- a/video.c
+++ b/video.c
@@ -10,7 +10,6 @@
 /* Common stuff: */
 #include "motion.h"
 #include "video.h"
-#include "conf.h"
 /* for rotation */
 #include "rotate.h"
 
diff --git a/video_freebsd.c b/video_freebsd.c
index 85381eeb..7d3ccd0e 100644
--- a/video_freebsd.c
+++ b/video_freebsd.c
@@ -10,7 +10,6 @@
 /* Common stuff: */
 #include "motion.h"
 #include "video_freebsd.h"
-#include "conf.h"
 /* for rotation */
 #include "rotate.h"
 
@@ -572,7 +571,7 @@ static unsigned char *v4l_start(struct context *cnt, struct video_dev *viddev, i
 	void *map;
 
 	/* if we have choose the tuner is needed to setup the frequency */
-	if ( ((viddev->tuner_device != NULL)) && ( input == IN_TV ) ) {
+	if ( (viddev->tuner_device != NULL) && ( input == IN_TV ) ) {
 		if (!freq) {
 			motion_log(LOG_ERR, 1, "Not valid Frequency [%lu] for Source input [%i]", freq, input);
 			return (NULL);
diff --git a/webcam.c b/webcam.c
index 84f77396..d839bfb6 100644
--- a/webcam.c
+++ b/webcam.c
@@ -19,8 +19,7 @@
  */
 
 #include "picture.h"
-#include "webcam.h"
-#include "motion.h"
+/* picture.h already includes motion.h and this one webcam.h */
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
diff --git a/webhttpd.c b/webhttpd.c
index e5270a14..c198862e 100644
--- a/webhttpd.c
+++ b/webhttpd.c
@@ -16,9 +16,6 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
-#include "conf.h"
-#include "webhttpd.h"
-#include "netcam_wget.h"
 
 pthread_mutex_t httpd_mutex;